From 82f2fcc637ebea4bb26828ce3ca35ba638ccf643 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 8 Feb 2017 21:25:44 +0000
Subject: [PATCH 01/96] [pug-lexer][optimisation] Only call assertExpression
 when necessary (#2712)

---
 packages/pug-lexer/index.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index 91300f919..5f6977212 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -1059,22 +1059,25 @@ Lexer.prototype = {
         } else if (loc === 'value') {
           // if the character is in a string or in parentheses/brackets/braces
           if (state.isNesting() || state.isString()) return false;
+
           // if the current value expression is not valid JavaScript, then
-          // assume that the user did not end the value
-          if (!self.assertExpression(val, true)) return false;
+          // assume that the user did not end the value.  To enforce this,
+          // we call `self.assertExpression(val, true)`, but since the other
+          // tests are much faster, we run the other tests first.
+
           if (whitespaceRe.test(str[i])) {
             // find the first non-whitespace character
             for (var x = i; x < str.length; x++) {
               if (!whitespaceRe.test(str[x])) {
                 // if it is a JavaScript punctuator, then assume that it is
                 // a part of the value
-                return !characterParser.isPunctuator(str[x]) || quoteRe.test(str[x]);
+                return (!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x])) && self.assertExpression(val, true);
               }
             }
           }
           // if there's no whitespace and the character is not ',', the
           // attribute did not end.
-          return str[i] === ',';
+          return str[i] === ',' && self.assertExpression(val, true);
         }
       }
 

From 31d1f681817073ae789d8b18f70121e5a4577c83 Mon Sep 17 00:00:00 2001
From: John Manuel <bitencode@johnmanuel.org>
Date: Mon, 17 Apr 2017 17:19:16 -0700
Subject: [PATCH 02/96] [pug-lexer] Allow a colon to start an attribute (#2773)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add check for literal ‘:’
* Add test case for “typical” Vue.js short-cut syntax for `v-bind:`  (`:`)
* New test case passes with change (fails without the change)
---
 packages/pug-lexer/index.js              | 2 +-
 packages/pug/test/cases/attrs.colon.html | 1 +
 packages/pug/test/cases/attrs.colon.pug  | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 packages/pug/test/cases/attrs.colon.html
 create mode 100644 packages/pug/test/cases/attrs.colon.pug

diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index 5f6977212..f901332d6 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -1071,7 +1071,7 @@ Lexer.prototype = {
               if (!whitespaceRe.test(str[x])) {
                 // if it is a JavaScript punctuator, then assume that it is
                 // a part of the value
-                return (!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x])) && self.assertExpression(val, true);
+                return (!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x]) || str[x] === ':') && self.assertExpression(val, true);
               }
             }
           }
diff --git a/packages/pug/test/cases/attrs.colon.html b/packages/pug/test/cases/attrs.colon.html
new file mode 100644
index 000000000..f8e02d617
--- /dev/null
+++ b/packages/pug/test/cases/attrs.colon.html
@@ -0,0 +1 @@
+<div :my-var="model"></div><span v-for="item in items" :key="item.id" :value="item.name"></span><span v-for="item in items" :key="item.id" :value="item.name"></span><a :link="goHere" value="static" :my-value="dynamic" @click="onClick()" :another="more">Click Me!</a>
diff --git a/packages/pug/test/cases/attrs.colon.pug b/packages/pug/test/cases/attrs.colon.pug
new file mode 100644
index 000000000..ed7ea7cbb
--- /dev/null
+++ b/packages/pug/test/cases/attrs.colon.pug
@@ -0,0 +1,9 @@
+//- Tests for using a colon-prefexed attribute (typical when using short-cut for Vue.js `v-bind`)
+div(:my-var="model")
+span(v-for="item in items" :key="item.id" :value="item.name")
+span(
+  v-for="item in items"
+  :key="item.id"
+  :value="item.name"
+)
+a(:link="goHere" value="static" :my-value="dynamic" @click="onClick()" :another="more") Click Me!

From bc92bdc399169aed59d6ad07f9f51e8d3b63c50c Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 18 Apr 2017 01:33:51 +0100
Subject: [PATCH 03/96] [chore] Update tests (#2778)

coffee-script have released a new version with better output.  Our
tests show the old coffee-script output.
---
 .../pug-filters/test/__snapshots__/index.test.js.snap     | 8 ++++----
 packages/pug/test/cases/filters.coffeescript.html         | 7 ++++---
 packages/pug/test/cases/filters.include.html              | 5 ++---
 packages/pug/test/cases/filters.nested.html               | 3 +--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/pug-filters/test/__snapshots__/index.test.js.snap b/packages/pug-filters/test/__snapshots__/index.test.js.snap
index e2df93687..b304bd56b 100644
--- a/packages/pug-filters/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-filters/test/__snapshots__/index.test.js.snap
@@ -150,7 +150,7 @@ exports[`test cases/filters.coffeescript.input.json 1`] = `
             ],
             \"line\": 4,
             \"filename\": \"filters.coffeescript.tokens.json\",
-            \"val\": \"(function(){var n;n={square:function(n){return n*n}}}).call(this);\"
+            \"val\": \"(function(){}).call(this);\"
           }
         ],
         \"line\": 1,
@@ -381,7 +381,7 @@ exports[`test cases/filters.include.input.json 1`] = `
                         \"type\": \"Text\",
                         \"line\": 5,
                         \"filename\": \"filters.include.tokens.json\",
-                        \"val\": \"(function(){var n;n={square:function(n){return n*n}}}).call(this);\"
+                        \"val\": \"(function(){}).call(this);\"
                       }
                     ],
                     \"line\": 4,
@@ -835,7 +835,7 @@ exports[`test cases/filters.nested.input.json 1`] = `
                   \"attrs\": [],
                   \"line\": 7,
                   \"filename\": \"filters.nested.tokens.json\",
-                  \"val\": \"(function(){!function(){return console.log(\\\"test\\\")}()}).call(this);\"
+                  \"val\": \"(function(){!function(){console.log(\\\"test\\\")}()}).call(this);\"
                 }
               ],
               \"line\": 7,
@@ -844,7 +844,7 @@ exports[`test cases/filters.nested.input.json 1`] = `
             \"attrs\": [],
             \"line\": 7,
             \"filename\": \"filters.nested.tokens.json\",
-            \"val\": \"<![CDATA[(function(){!function(){return console.log(\\\"test\\\")}()}).call(this);]]>\"
+            \"val\": \"<![CDATA[(function(){!function(){console.log(\\\"test\\\")}()}).call(this);]]>\"
           }
         ],
         \"line\": 6,
diff --git a/packages/pug/test/cases/filters.coffeescript.html b/packages/pug/test/cases/filters.coffeescript.html
index ceddb0cc8..739406132 100644
--- a/packages/pug/test/cases/filters.coffeescript.html
+++ b/packages/pug/test/cases/filters.coffeescript.html
@@ -1,8 +1,9 @@
-<script type="text/javascript">(function() {
+<script type="text/javascript">
+  (function() {
   var regexp;
 
   regexp = /\n/;
 
 }).call(this);
-(function(){var n;n={square:function(n){return n*n}}}).call(this);
-</script>
\ No newline at end of file
+  (function(){}).call(this);
+</script>
diff --git a/packages/pug/test/cases/filters.include.html b/packages/pug/test/cases/filters.include.html
index cc74456b5..1dc755ff5 100644
--- a/packages/pug/test/cases/filters.include.html
+++ b/packages/pug/test/cases/filters.include.html
@@ -1,9 +1,8 @@
 <html>
   <body><p>Just <em>some</em> markdown <strong>tests</strong>.</p>
-
 <p>With new line.</p>
-    <script>(function(){var n;n={square:function(n){return n*n}}}).call(this);
-    </script>
+
+    <script>(function(){}).call(this);</script>
     <script>(function() {
   var math;
 
diff --git a/packages/pug/test/cases/filters.nested.html b/packages/pug/test/cases/filters.nested.html
index 67f31e3bb..a5a2af312 100644
--- a/packages/pug/test/cases/filters.nested.html
+++ b/packages/pug/test/cases/filters.nested.html
@@ -1,3 +1,2 @@
-
 <script><![CDATA[!function(){console.log("test")}();]]></script>
-<script><![CDATA[(function(){!function(){return console.log("test")}()}).call(this);]]></script>
\ No newline at end of file
+<script><![CDATA[(function(){!function(){console.log("test")}()}).call(this);]]></script>

From ec18ece7a2e0eaec4a565153e6c5fb4238d03fe9 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 18 Apr 2017 01:36:22 +0100
Subject: [PATCH 04/96] Publish

 - pug-filters@2.1.2
 - pug-lexer@3.1.0
 - pug-linker@2.0.3
 - pug-load@2.0.6
 - pug-walk@1.1.2
 - pug@2.0.0-beta.12
---
 packages/pug-filters/package.json |  8 ++++----
 packages/pug-lexer/package.json   |  2 +-
 packages/pug-linker/package.json  |  8 ++++----
 packages/pug-load/package.json    |  6 +++---
 packages/pug-walk/package.json    |  4 ++--
 packages/pug/package.json         | 10 +++++-----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 6298161b8..31cc51b6b 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
@@ -9,7 +9,7 @@
     "clean-css": "^3.3.0",
     "constantinople": "^3.0.1",
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.1",
+    "pug-walk": "^1.1.2",
     "jstransformer": "1.0.0",
     "resolve": "^1.1.6",
     "uglify-js": "^2.6.1"
@@ -22,8 +22,8 @@
     "jstransformer-markdown-it": "^1.0.0",
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
-    "pug-lexer": "^3.0.0",
-    "pug-load": "^2.0.5",
+    "pug-lexer": "^3.1.0",
+    "pug-load": "^2.0.6",
     "pug-parser": "^2.0.2"
   },
   "repository": {
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index f50c67d9c..063c606ac 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-lexer",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "The pug lexer (takes a string and converts it to an array of tokens)",
   "keywords": [
     "pug"
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index e09ec422e..fe4a831f8 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,17 +1,17 @@
 {
   "name": "pug-linker",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.1"
+    "pug-walk": "^1.1.2"
   },
   "devDependencies": {
-    "pug-lexer": "^3.0.0",
-    "pug-load": "^2.0.5",
+    "pug-lexer": "^3.1.0",
+    "pug-load": "^2.0.6",
     "pug-parser": "^2.0.2"
   },
   "repository": {
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index e74fa92d3..d3118869f 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -1,16 +1,16 @@
 {
   "name": "pug-load",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "The Pug loader is responsible for loading the depenendencies of a given Pug file.",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "object-assign": "^4.1.0",
-    "pug-walk": "^1.1.1"
+    "pug-walk": "^1.1.2"
   },
   "devDependencies": {
-    "pug-lexer": "^3.0.0",
+    "pug-lexer": "^3.1.0",
     "pug-parser": "^2.0.2"
   },
   "repository": {
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index 74134c4c5..f3ba4b906 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -1,13 +1,13 @@
 {
   "name": "pug-walk",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Walk and transform a pug AST",
   "keywords": [
     "pug"
   ],
   "dependencies": {},
   "devDependencies": {
-    "pug-lexer": "^3.0.0",
+    "pug-lexer": "^3.1.0",
     "pug-parser": "^2.0.2"
   },
   "files": [
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 06192e24f..5c0ee2131 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.0-beta11",
+  "version": "2.0.0-beta.12",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -21,10 +21,10 @@
   "main": "lib",
   "dependencies": {
     "pug-code-gen": "^1.1.1",
-    "pug-filters": "^2.1.1",
-    "pug-lexer": "^3.0.0",
-    "pug-linker": "^2.0.2",
-    "pug-load": "^2.0.5",
+    "pug-filters": "^2.1.2",
+    "pug-lexer": "^3.1.0",
+    "pug-linker": "^2.0.3",
+    "pug-load": "^2.0.6",
     "pug-parser": "^2.0.2",
     "pug-runtime": "^2.0.3",
     "pug-strip-comments": "^1.0.2"

From 5c704b26fa4cb26d9b35f64f1e3d07f13cdfd6b4 Mon Sep 17 00:00:00 2001
From: Kyle <kylekatarnls@users.noreply.github.com>
Date: Thu, 27 Apr 2017 02:17:24 +0900
Subject: [PATCH 05/96] Unit test for #2404 Extends extending even when in if
 block (#2743)

---
 packages/pug/test/pug.test.js                   |  9 +++++++++
 test/fixtures/issue-2404/default.pug            |  2 ++
 test/fixtures/issue-2404/mixin.call.extends.pug | 10 ++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 test/fixtures/issue-2404/default.pug
 create mode 100644 test/fixtures/issue-2404/mixin.call.extends.pug

diff --git a/packages/pug/test/pug.test.js b/packages/pug/test/pug.test.js
index 608419d47..d0dadd1f5 100644
--- a/packages/pug/test/pug.test.js
+++ b/packages/pug/test/pug.test.js
@@ -890,6 +890,15 @@ describe('pug', function(){
     it('does not produce warnings for issue-1593', function () {
       pug.compileFile(__dirname + '/fixtures/issue-1593/index.pug');
     });
+    it('does throw error for issue-2404', function () {
+      var message = '';
+      try {
+        pug.compileFile(__dirname + '/fixtures/issue-2404/mixin.call.extends.pug');
+      } catch (e) {
+        message = e.message;
+      }
+      assert(message.indexOf('Declaration of template inheritance ("extends") should be the first thing in the file.') !== -1);
+    });
     it('should support caching (pass 1)', function () {
       fs.writeFileSync(__dirname + '/temp/input-compileFile.pug', '.foo bar');
       var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug',
diff --git a/test/fixtures/issue-2404/default.pug b/test/fixtures/issue-2404/default.pug
new file mode 100644
index 000000000..94ae27e0c
--- /dev/null
+++ b/test/fixtures/issue-2404/default.pug
@@ -0,0 +1,2 @@
+body
+  block content
diff --git a/test/fixtures/issue-2404/mixin.call.extends.pug b/test/fixtures/issue-2404/mixin.call.extends.pug
new file mode 100644
index 000000000..8064ff47d
--- /dev/null
+++ b/test/fixtures/issue-2404/mixin.call.extends.pug
@@ -0,0 +1,10 @@
+mixin content
+  if bar
+    extends default
+    block content
+      block
+  else
+    block
+
++content
+  h1 Hello!

From df7d66119413c16616195ddc3bac3a02505d4cff Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 26 Apr 2017 20:19:06 +0200
Subject: [PATCH 06/96] Fix test for extends not at top level and ensure second
 extends always triggers an early exception (#2791)

---
 packages/pug-linker/index.js                  |  4 ++--
 .../test/__snapshots__/index.test.js.snap     |  2 +-
 .../test/extends-not-top-level}/default.pug   |  0
 .../test/extends-not-top-level/duplicate.pug  |  2 ++
 .../pug/test/extends-not-top-level/index.pug  |  0
 .../test/extends-not-top-level/index.test.js  | 19 +++++++++++++++++++
 packages/pug/test/pug.test.js                 |  9 ---------
 7 files changed, 24 insertions(+), 12 deletions(-)
 rename {test/fixtures/issue-2404 => packages/pug/test/extends-not-top-level}/default.pug (100%)
 create mode 100644 packages/pug/test/extends-not-top-level/duplicate.pug
 rename test/fixtures/issue-2404/mixin.call.extends.pug => packages/pug/test/extends-not-top-level/index.pug (100%)
 create mode 100644 packages/pug/test/extends-not-top-level/index.test.js

diff --git a/packages/pug-linker/index.js b/packages/pug-linker/index.js
index 98cba5e4f..7e82003ed 100644
--- a/packages/pug-linker/index.js
+++ b/packages/pug-linker/index.js
@@ -13,10 +13,10 @@ function link(ast) {
   var extendsNode = null;
   if (ast.nodes.length) {
     var hasExtends = ast.nodes[0].type === 'Extends';
+    checkExtendPosition(ast, hasExtends);
     if (hasExtends) {
       extendsNode = ast.nodes.shift();
     }
-    checkExtendPosition(ast, hasExtends);
   }
   ast = applyIncludes(ast);
   ast.declaredBlocks = findDeclaredBlocks(ast);
@@ -164,7 +164,7 @@ function checkExtendPosition(ast, hasExtends) {
       if (hasExtends && !legitExtendsReached) {
         legitExtendsReached = true;
       } else {
-        error('EXTENDS_NOT_FIRST', 'Declaration of template inheritance ("extends") should be the first thing in the file.', node);
+        error('EXTENDS_NOT_FIRST', 'Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.', node);
       }
     }
   });
diff --git a/packages/pug-linker/test/__snapshots__/index.test.js.snap b/packages/pug-linker/test/__snapshots__/index.test.js.snap
index 786f13182..a36cdebc8 100644
--- a/packages/pug-linker/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-linker/test/__snapshots__/index.test.js.snap
@@ -3570,7 +3570,7 @@ exports[`error handling extends-not-first.input.json 1`] = `
 Object {
   "code": "PUG:EXTENDS_NOT_FIRST",
   "line": 4,
-  "msg": "Declaration of template inheritance (\"extends\") should be the first thing in the file.",
+  "msg": "Declaration of template inheritance (\"extends\") should be the first thing in the file. There can only be one extends statement per file.",
 }
 `;
 
diff --git a/test/fixtures/issue-2404/default.pug b/packages/pug/test/extends-not-top-level/default.pug
similarity index 100%
rename from test/fixtures/issue-2404/default.pug
rename to packages/pug/test/extends-not-top-level/default.pug
diff --git a/packages/pug/test/extends-not-top-level/duplicate.pug b/packages/pug/test/extends-not-top-level/duplicate.pug
new file mode 100644
index 000000000..3786c4c55
--- /dev/null
+++ b/packages/pug/test/extends-not-top-level/duplicate.pug
@@ -0,0 +1,2 @@
+extends default
+extends default
diff --git a/test/fixtures/issue-2404/mixin.call.extends.pug b/packages/pug/test/extends-not-top-level/index.pug
similarity index 100%
rename from test/fixtures/issue-2404/mixin.call.extends.pug
rename to packages/pug/test/extends-not-top-level/index.pug
diff --git a/packages/pug/test/extends-not-top-level/index.test.js b/packages/pug/test/extends-not-top-level/index.test.js
new file mode 100644
index 000000000..43877a026
--- /dev/null
+++ b/packages/pug/test/extends-not-top-level/index.test.js
@@ -0,0 +1,19 @@
+const pug = require('../../');
+
+// regression test for #2404
+
+test('extends not top level should throw an error', () => {
+  expect(
+    () => pug.compileFile(
+      __dirname + '/index.pug'
+    )
+  ).toThrow('Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.');
+});
+
+test('duplicate extends should throw an error', () => {
+  expect(
+    () => pug.compileFile(
+      __dirname + '/duplicate.pug'
+    )
+  ).toThrow('Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.');
+});
diff --git a/packages/pug/test/pug.test.js b/packages/pug/test/pug.test.js
index d0dadd1f5..608419d47 100644
--- a/packages/pug/test/pug.test.js
+++ b/packages/pug/test/pug.test.js
@@ -890,15 +890,6 @@ describe('pug', function(){
     it('does not produce warnings for issue-1593', function () {
       pug.compileFile(__dirname + '/fixtures/issue-1593/index.pug');
     });
-    it('does throw error for issue-2404', function () {
-      var message = '';
-      try {
-        pug.compileFile(__dirname + '/fixtures/issue-2404/mixin.call.extends.pug');
-      } catch (e) {
-        message = e.message;
-      }
-      assert(message.indexOf('Declaration of template inheritance ("extends") should be the first thing in the file.') !== -1);
-    });
     it('should support caching (pass 1)', function () {
       fs.writeFileSync(__dirname + '/temp/input-compileFile.pug', '.foo bar');
       var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug',

From 93097afb14ce3a8e8955a2e0f46dbb92aa45740f Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 2 May 2017 00:01:15 +0100
Subject: [PATCH 07/96] Remove named blocks from included templates if they
 extend (#2792)

* Add regression tests for #2436

* Update snapshot to match user's typical expectations.

* Remove named blocks from included templates that extend

[fixes #2436]
---
 packages/pug-linker/index.js                  |  17 +-
 .../test/__snapshots__/index.test.js.snap     | 200 ++----------------
 .../__snapshots__/index.test.js.snap          |  15 ++
 .../pug/test/regression-2436/index.test.js    |  17 ++
 packages/pug/test/regression-2436/issue1.pug  |   7 +
 packages/pug/test/regression-2436/issue2.pug  |   7 +
 packages/pug/test/regression-2436/layout.pug  |   6 +
 packages/pug/test/regression-2436/other1.pug  |   4 +
 packages/pug/test/regression-2436/other2.pug  |   4 +
 .../pug/test/regression-2436/other_layout.pug |   4 +
 10 files changed, 101 insertions(+), 180 deletions(-)
 create mode 100644 packages/pug/test/regression-2436/__snapshots__/index.test.js.snap
 create mode 100644 packages/pug/test/regression-2436/index.test.js
 create mode 100644 packages/pug/test/regression-2436/issue1.pug
 create mode 100644 packages/pug/test/regression-2436/issue2.pug
 create mode 100644 packages/pug/test/regression-2436/layout.pug
 create mode 100644 packages/pug/test/regression-2436/other1.pug
 create mode 100644 packages/pug/test/regression-2436/other2.pug
 create mode 100644 packages/pug/test/regression-2436/other_layout.pug

diff --git a/packages/pug-linker/index.js b/packages/pug-linker/index.js
index 7e82003ed..2d6d90255 100644
--- a/packages/pug-linker/index.js
+++ b/packages/pug-linker/index.js
@@ -55,6 +55,7 @@ function link(ast) {
       parent.declaredBlocks[name] = ast.declaredBlocks[name];
     });
     parent.nodes = mixins.concat(parent.nodes);
+    parent.hasExtends = true;
     return parent;
   }
   return ast;
@@ -123,7 +124,21 @@ function applyIncludes(ast, child) {
     }
   }, function after(node, replace) {
     if (node.type === 'Include') {
-      replace(applyYield(link(node.file.ast), node.block));
+      var childAST = link(node.file.ast);
+      if (childAST.hasExtends) {
+        childAST = removeBlocks(childAST);
+      }
+      replace(applyYield(childAST, node.block));
+    }
+  });
+}
+function removeBlocks(ast) {
+  return walk(ast, function (node, replace) {
+    if (node.type === 'NamedBlock') {
+      replace({
+        type: 'Block',
+        nodes: node.nodes
+      });
     }
   });
 }
diff --git a/packages/pug-linker/test/__snapshots__/index.test.js.snap b/packages/pug-linker/test/__snapshots__/index.test.js.snap
index a36cdebc8..bfbf2f6bd 100644
--- a/packages/pug-linker/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-linker/test/__snapshots__/index.test.js.snap
@@ -370,60 +370,7 @@ Object {
 
 exports[`cases from pug include-extends-from-root.input.json 1`] = `
 Object {
-  "declaredBlocks": Object {
-    "content": Array [
-      Object {
-        "filename": "auxiliary/layout.pug",
-        "line": 6,
-        "mode": "replace",
-        "name": "content",
-        "nodes": Array [
-          Object {
-            "declaredBlocks": Object {},
-            "filename": "auxiliary/include-from-root.pug",
-            "line": 0,
-            "nodes": Array [
-              Object {
-                "attributeBlocks": Array [],
-                "attrs": Array [],
-                "block": Object {
-                  "filename": "auxiliary/include-from-root.pug",
-                  "line": 1,
-                  "nodes": Array [
-                    Object {
-                      "filename": "auxiliary/include-from-root.pug",
-                      "line": 1,
-                      "type": "Text",
-                      "val": "hello",
-                    },
-                  ],
-                  "type": "Block",
-                },
-                "filename": "auxiliary/include-from-root.pug",
-                "isInline": false,
-                "line": 1,
-                "name": "h1",
-                "selfClosing": false,
-                "type": "Tag",
-              },
-            ],
-            "type": "Block",
-          },
-        ],
-        "type": "NamedBlock",
-      },
-    ],
-    "head": Array [
-      Object {
-        "filename": "auxiliary/layout.pug",
-        "line": 4,
-        "mode": "replace",
-        "name": "head",
-        "nodes": Array [],
-        "type": "NamedBlock",
-      },
-    ],
-  },
+  "declaredBlocks": Object {},
   "filename": "include-extends-from-root.pug",
   "line": 0,
   "nodes": Array [
@@ -525,6 +472,7 @@ Object {
         ],
       },
       "filename": "auxiliary/layout.pug",
+      "hasExtends": true,
       "line": 0,
       "nodes": Array [
         Object {
@@ -565,12 +513,8 @@ Object {
                       "type": "Tag",
                     },
                     Object {
-                      "filename": "auxiliary/layout.pug",
-                      "line": 4,
-                      "mode": "replace",
-                      "name": "head",
                       "nodes": Array [],
-                      "type": "NamedBlock",
+                      "type": "Block",
                     },
                   ],
                   "type": "Block",
@@ -590,10 +534,6 @@ Object {
                   "line": 5,
                   "nodes": Array [
                     Object {
-                      "filename": "auxiliary/layout.pug",
-                      "line": 6,
-                      "mode": "replace",
-                      "name": "content",
                       "nodes": Array [
                         Object {
                           "declaredBlocks": Object {},
@@ -627,7 +567,7 @@ Object {
                           "type": "Block",
                         },
                       ],
-                      "type": "NamedBlock",
+                      "type": "Block",
                     },
                   ],
                   "type": "Block",
@@ -659,74 +599,7 @@ Object {
 
 exports[`cases from pug include-extends-of-common-template.input.json 1`] = `
 Object {
-  "declaredBlocks": Object {
-    "test": Array [
-      Object {
-        "filename": "auxiliary/empty-block.pug",
-        "line": 1,
-        "mode": "replace",
-        "name": "test",
-        "nodes": Array [
-          Object {
-            "attributeBlocks": Array [],
-            "attrs": Array [],
-            "block": Object {
-              "filename": "auxiliary/extends-empty-block-1.pug",
-              "line": 4,
-              "nodes": Array [
-                Object {
-                  "filename": "auxiliary/extends-empty-block-1.pug",
-                  "line": 4,
-                  "type": "Text",
-                  "val": "test1",
-                },
-              ],
-              "type": "Block",
-            },
-            "filename": "auxiliary/extends-empty-block-1.pug",
-            "isInline": false,
-            "line": 4,
-            "name": "div",
-            "selfClosing": false,
-            "type": "Tag",
-          },
-        ],
-        "type": "NamedBlock",
-      },
-      Object {
-        "filename": "auxiliary/empty-block.pug",
-        "line": 1,
-        "mode": "replace",
-        "name": "test",
-        "nodes": Array [
-          Object {
-            "attributeBlocks": Array [],
-            "attrs": Array [],
-            "block": Object {
-              "filename": "auxiliary/extends-empty-block-2.pug",
-              "line": 4,
-              "nodes": Array [
-                Object {
-                  "filename": "auxiliary/extends-empty-block-2.pug",
-                  "line": 4,
-                  "type": "Text",
-                  "val": "test2",
-                },
-              ],
-              "type": "Block",
-            },
-            "filename": "auxiliary/extends-empty-block-2.pug",
-            "isInline": false,
-            "line": 4,
-            "name": "div",
-            "selfClosing": false,
-            "type": "Tag",
-          },
-        ],
-        "type": "NamedBlock",
-      },
-    ],
-  },
+  "declaredBlocks": Object {},
   "filename": "include-extends-of-common-template.pug",
   "line": 0,
   "nodes": Array [
@@ -802,13 +675,10 @@ Object {
         ],
       },
       "filename": "auxiliary/empty-block.pug",
+      "hasExtends": true,
       "line": 0,
       "nodes": Array [
         Object {
-          "filename": "auxiliary/empty-block.pug",
-          "line": 1,
-          "mode": "replace",
-          "name": "test",
           "nodes": Array [
             Object {
               "attributeBlocks": Array [],
@@ -834,7 +704,7 @@ Object {
               "type": "Tag",
             },
           ],
-          "type": "NamedBlock",
+          "type": "Block",
         },
       ],
       "type": "Block",
@@ -911,13 +781,10 @@ Object {
         ],
       },
       "filename": "auxiliary/empty-block.pug",
+      "hasExtends": true,
       "line": 0,
       "nodes": Array [
         Object {
-          "filename": "auxiliary/empty-block.pug",
-          "line": 1,
-          "mode": "replace",
-          "name": "test",
           "nodes": Array [
             Object {
               "attributeBlocks": Array [],
@@ -943,7 +810,7 @@ Object {
               "type": "Tag",
             },
           ],
-          "type": "NamedBlock",
+          "type": "Block",
         },
       ],
       "type": "Block",
@@ -955,33 +822,7 @@ Object {
 
 exports[`cases from pug include-extends-relative.input.json 1`] = `
 Object {
-  "declaredBlocks": Object {
-    "content": Array [
-      Object {
-        "filename": "../cases-src/auxiliary/layout.pug",
-        "line": 6,
-        "mode": "replace",
-        "name": "content",
-        "nodes": Array [
-          Object {
-            "type": "Text",
-            "val": "h1 hello",
-          },
-        ],
-        "type": "NamedBlock",
-      },
-    ],
-    "head": Array [
-      Object {
-        "filename": "../cases-src/auxiliary/layout.pug",
-        "line": 4,
-        "mode": "replace",
-        "name": "head",
-        "nodes": Array [],
-        "type": "NamedBlock",
-      },
-    ],
-  },
+  "declaredBlocks": Object {},
   "filename": "include-extends-relative.pug",
   "line": 0,
   "nodes": Array [
@@ -1029,6 +870,7 @@ Object {
         ],
       },
       "filename": "../cases-src/auxiliary/layout.pug",
+      "hasExtends": true,
       "line": 0,
       "nodes": Array [
         Object {
@@ -1069,12 +911,8 @@ Object {
                       "type": "Tag",
                     },
                     Object {
-                      "filename": "../cases-src/auxiliary/layout.pug",
-                      "line": 4,
-                      "mode": "replace",
-                      "name": "head",
                       "nodes": Array [],
-                      "type": "NamedBlock",
+                      "type": "Block",
                     },
                   ],
                   "type": "Block",
@@ -1094,17 +932,13 @@ Object {
                   "line": 5,
                   "nodes": Array [
                     Object {
-                      "filename": "../cases-src/auxiliary/layout.pug",
-                      "line": 6,
-                      "mode": "replace",
-                      "name": "content",
                       "nodes": Array [
                         Object {
                           "type": "Text",
                           "val": "h1 hello",
                         },
                       ],
-                      "type": "NamedBlock",
+                      "type": "Block",
                     },
                   ],
                   "type": "Block",
@@ -1924,6 +1758,7 @@ Object {
     ],
   },
   "filename": "../fixtures/append/layout.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [
     Object {
@@ -2228,6 +2063,7 @@ Object {
     ],
   },
   "filename": "../fixtures/append-without-block/layout.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [
     Object {
@@ -2694,6 +2530,7 @@ Object {
     ],
   },
   "filename": "../fixtures/multi-append-prepend-block/root.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [
     Object {
@@ -3086,6 +2923,7 @@ Object {
     ],
   },
   "filename": "../fixtures/prepend/layout.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [
     Object {
@@ -3390,6 +3228,7 @@ Object {
     ],
   },
   "filename": "../fixtures/prepend-without-block/layout.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [
     Object {
@@ -3586,6 +3425,7 @@ exports[`special cases extending-empty.input.json 1`] = `
 Object {
   "declaredBlocks": Object {},
   "filename": "../fixtures/empty.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [],
   "type": "Block",
@@ -3681,6 +3521,7 @@ Object {
     ],
   },
   "filename": "../fixtures/layout.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [
     Object {
@@ -3990,6 +3831,7 @@ Object {
     ],
   },
   "filename": "../fixtures/layout.pug",
+  "hasExtends": true,
   "line": 0,
   "nodes": Array [
     Object {
diff --git a/packages/pug/test/regression-2436/__snapshots__/index.test.js.snap b/packages/pug/test/regression-2436/__snapshots__/index.test.js.snap
new file mode 100644
index 000000000..552bcdcdc
--- /dev/null
+++ b/packages/pug/test/regression-2436/__snapshots__/index.test.js.snap
@@ -0,0 +1,15 @@
+exports[`test #2436 - block with a same name extends from different layout in nesting 1`] = `
+"
+<h1>layout </h1>
+<p>Main A</p>
+<h1>other layout</h1>
+<p>Other A</p>"
+`;
+
+exports[`test #2436 - block with a same name extends from the same layout in nesting 1`] = `
+"
+<h1>layout </h1>
+<p>Main A</p>
+<h1>layout </h1>
+<p>Other A</p>"
+`;
diff --git a/packages/pug/test/regression-2436/index.test.js b/packages/pug/test/regression-2436/index.test.js
new file mode 100644
index 000000000..47a1ae44b
--- /dev/null
+++ b/packages/pug/test/regression-2436/index.test.js
@@ -0,0 +1,17 @@
+const pug = require('../../');
+
+test('#2436 - block with a same name extends from the same layout in nesting', () => {
+    const output = pug.renderFile(
+        __dirname + '/issue1.pug',
+        {pretty: true}
+    );
+    expect(output).toMatchSnapshot();
+});
+
+test('#2436 - block with a same name extends from different layout in nesting', () => {
+    const output = pug.renderFile(
+        __dirname + '/issue2.pug',
+        {pretty: true}
+    );
+    expect(output).toMatchSnapshot();
+});
diff --git a/packages/pug/test/regression-2436/issue1.pug b/packages/pug/test/regression-2436/issue1.pug
new file mode 100644
index 000000000..f521c6ea2
--- /dev/null
+++ b/packages/pug/test/regression-2436/issue1.pug
@@ -0,0 +1,7 @@
+extends layout.pug
+
+block a
+    p Main A
+
+block b
+    include other1.pug
diff --git a/packages/pug/test/regression-2436/issue2.pug b/packages/pug/test/regression-2436/issue2.pug
new file mode 100644
index 000000000..7acba598a
--- /dev/null
+++ b/packages/pug/test/regression-2436/issue2.pug
@@ -0,0 +1,7 @@
+extends layout.pug
+
+block a
+    p Main A
+
+block b
+    include other2.pug
diff --git a/packages/pug/test/regression-2436/layout.pug b/packages/pug/test/regression-2436/layout.pug
new file mode 100644
index 000000000..71ad7eb93
--- /dev/null
+++ b/packages/pug/test/regression-2436/layout.pug
@@ -0,0 +1,6 @@
+h1 layout 
+
+block a
+    p block in layout
+
+block b
diff --git a/packages/pug/test/regression-2436/other1.pug b/packages/pug/test/regression-2436/other1.pug
new file mode 100644
index 000000000..206cb4fc9
--- /dev/null
+++ b/packages/pug/test/regression-2436/other1.pug
@@ -0,0 +1,4 @@
+extends layout.pug
+
+block a
+    p Other A
diff --git a/packages/pug/test/regression-2436/other2.pug b/packages/pug/test/regression-2436/other2.pug
new file mode 100644
index 000000000..6329aebb0
--- /dev/null
+++ b/packages/pug/test/regression-2436/other2.pug
@@ -0,0 +1,4 @@
+extends other_layout.pug
+
+block a
+    p Other A
diff --git a/packages/pug/test/regression-2436/other_layout.pug b/packages/pug/test/regression-2436/other_layout.pug
new file mode 100644
index 000000000..edda16157
--- /dev/null
+++ b/packages/pug/test/regression-2436/other_layout.pug
@@ -0,0 +1,4 @@
+h1 other layout
+
+block a
+    p block in other layout

From 29a73a52cb5f79cae33657178efb87039a279548 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Mon, 1 May 2017 19:01:32 -0400
Subject: [PATCH 08/96] Fixes #2774: "shadowed" blocks can be properly replaced
 / appended / prepended (#2793)

* Normalize line endings on Windows

* Adds failing test for replacing shadowed blocks

* Fixes #2774: shadowed blocks in 3+-level layout heirarchies can be replaced/appended/prepended

Updates snapshots for new shadowed block behavior.  When a block is
shadowed in an extending layout, node replacement / appending /
prepending is applied to the shadower block in addition to the parent,
shadowed block.  This change is reflected in the snapshots.
---
 .gitattributes                                |   1 +
 packages/pug-linker/index.js                  |   3 +-
 .../test/__snapshots__/index.test.js.snap     | 136 ++++++++++++++++++
 .../__snapshots__/index.test.js.snap          |   3 +
 packages/pug/test/shadowed-block/base.pug     |   4 +
 packages/pug/test/shadowed-block/index.pug    |   4 +
 .../pug/test/shadowed-block/index.test.js     |  14 ++
 packages/pug/test/shadowed-block/layout.pug   |   6 +
 8 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap
 create mode 100644 packages/pug/test/shadowed-block/base.pug
 create mode 100644 packages/pug/test/shadowed-block/index.pug
 create mode 100644 packages/pug/test/shadowed-block/index.test.js
 create mode 100644 packages/pug/test/shadowed-block/layout.pug

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..749ae8148
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*   text=auto eol=lf
diff --git a/packages/pug-linker/index.js b/packages/pug-linker/index.js
index 2d6d90255..e7993e8f2 100644
--- a/packages/pug-linker/index.js
+++ b/packages/pug-linker/index.js
@@ -77,9 +77,8 @@ function flattenParentBlocks(parentBlocks, accumulator) {
   parentBlocks.forEach(function (parentBlock) {
     if (parentBlock.parents) {
       flattenParentBlocks(parentBlock.parents, accumulator);
-    } else {
-      accumulator.push(parentBlock);
     }
+    accumulator.push(parentBlock);
   });
   return accumulator;
 }
diff --git a/packages/pug-linker/test/__snapshots__/index.test.js.snap b/packages/pug-linker/test/__snapshots__/index.test.js.snap
index bfbf2f6bd..5e64d97e5 100644
--- a/packages/pug-linker/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-linker/test/__snapshots__/index.test.js.snap
@@ -2242,6 +2242,74 @@ Object {
         "mode": "replace",
         "name": "content",
         "nodes": Array [
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'last\'",
+              },
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'prepend\'",
+              },
+            ],
+            "block": Object {
+              "filename": "layout.multi.append.prepend.block.pug",
+              "line": 13,
+              "nodes": Array [
+                Object {
+                  "filename": "layout.multi.append.prepend.block.pug",
+                  "line": 13,
+                  "type": "Text",
+                  "val": "Last prepend must appear at top",
+                },
+              ],
+              "type": "Block",
+            },
+            "filename": "layout.multi.append.prepend.block.pug",
+            "isInline": false,
+            "line": 13,
+            "name": "p",
+            "selfClosing": false,
+            "type": "Tag",
+          },
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'first\'",
+              },
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'prepend\'",
+              },
+            ],
+            "block": Object {
+              "filename": "layout.multi.append.prepend.block.pug",
+              "line": 7,
+              "nodes": Array [
+                Object {
+                  "filename": "layout.multi.append.prepend.block.pug",
+                  "line": 7,
+                  "type": "Text",
+                  "val": "Something prepended to content",
+                },
+              ],
+              "type": "Block",
+            },
+            "filename": "layout.multi.append.prepend.block.pug",
+            "isInline": false,
+            "line": 7,
+            "name": "p",
+            "selfClosing": false,
+            "type": "Tag",
+          },
           Object {
             "attributeBlocks": Array [],
             "attrs": Array [
@@ -2271,6 +2339,74 @@ Object {
             "selfClosing": false,
             "type": "Tag",
           },
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'first\'",
+              },
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'append\'",
+              },
+            ],
+            "block": Object {
+              "filename": "layout.multi.append.prepend.block.pug",
+              "line": 4,
+              "nodes": Array [
+                Object {
+                  "filename": "layout.multi.append.prepend.block.pug",
+                  "line": 4,
+                  "type": "Text",
+                  "val": "Something appended to content",
+                },
+              ],
+              "type": "Block",
+            },
+            "filename": "layout.multi.append.prepend.block.pug",
+            "isInline": false,
+            "line": 4,
+            "name": "p",
+            "selfClosing": false,
+            "type": "Tag",
+          },
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'last\'",
+              },
+              Object {
+                "mustEscape": false,
+                "name": "class",
+                "val": "\'append\'",
+              },
+            ],
+            "block": Object {
+              "filename": "layout.multi.append.prepend.block.pug",
+              "line": 10,
+              "nodes": Array [
+                Object {
+                  "filename": "layout.multi.append.prepend.block.pug",
+                  "line": 10,
+                  "type": "Text",
+                  "val": "Last append must be most last",
+                },
+              ],
+              "type": "Block",
+            },
+            "filename": "layout.multi.append.prepend.block.pug",
+            "isInline": false,
+            "line": 10,
+            "name": "p",
+            "selfClosing": false,
+            "type": "Tag",
+          },
         ],
         "parents": Array [
           Object {
diff --git a/packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap b/packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap
new file mode 100644
index 000000000..c1446e484
--- /dev/null
+++ b/packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap
@@ -0,0 +1,3 @@
+exports[`test layout with shadowed block 1`] = `"<!-- layout.pug: root--><!-- index.pug: shadowed-->"`;
+
+exports[`test layout with shadowed block 2`] = `"<!-- layout.pug: root--><!-- index.pug: shadowed-->"`;
diff --git a/packages/pug/test/shadowed-block/base.pug b/packages/pug/test/shadowed-block/base.pug
new file mode 100644
index 000000000..7148cac3b
--- /dev/null
+++ b/packages/pug/test/shadowed-block/base.pug
@@ -0,0 +1,4 @@
+block root
+  // base.pug: root
+  block shadowed
+    // base.pug: shadowed
diff --git a/packages/pug/test/shadowed-block/index.pug b/packages/pug/test/shadowed-block/index.pug
new file mode 100644
index 000000000..dabca487e
--- /dev/null
+++ b/packages/pug/test/shadowed-block/index.pug
@@ -0,0 +1,4 @@
+extends ./layout.pug
+
+block shadowed
+  // index.pug: shadowed
diff --git a/packages/pug/test/shadowed-block/index.test.js b/packages/pug/test/shadowed-block/index.test.js
new file mode 100644
index 000000000..82f82f416
--- /dev/null
+++ b/packages/pug/test/shadowed-block/index.test.js
@@ -0,0 +1,14 @@
+const pug = require('../../');
+
+test('layout with shadowed block', () => {
+  const outputWithAjax = pug.renderFile(
+    __dirname + '/index.pug',
+    {ajax: true}
+  );
+  const outputWithoutAjax = pug.renderFile(
+    __dirname + '/index.pug',
+    {ajax: false}
+  );
+  expect(outputWithAjax).toMatchSnapshot();
+  expect(outputWithoutAjax).toMatchSnapshot();
+});
diff --git a/packages/pug/test/shadowed-block/layout.pug b/packages/pug/test/shadowed-block/layout.pug
new file mode 100644
index 000000000..fa27d25d1
--- /dev/null
+++ b/packages/pug/test/shadowed-block/layout.pug
@@ -0,0 +1,6 @@
+extends ./base.pug
+
+block root
+  // layout.pug: root
+  block shadowed
+    // layout.pug: shadowed

From 474d4a3c092e14bd8793809457f7c422b9553041 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 2 May 2017 00:02:41 +0100
Subject: [PATCH 09/96] Publish

 - pug-linker@3.0.0
 - pug@2.0.0-rc.1
---
 packages/pug-linker/package.json | 2 +-
 packages/pug/package.json        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index fe4a831f8..84141cfc5 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-linker",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 5c0ee2131..727179e72 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-rc.1",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -23,7 +23,7 @@
     "pug-code-gen": "^1.1.1",
     "pug-filters": "^2.1.2",
     "pug-lexer": "^3.1.0",
-    "pug-linker": "^2.0.3",
+    "pug-linker": "^3.0.0",
     "pug-load": "^2.0.6",
     "pug-parser": "^2.0.2",
     "pug-runtime": "^2.0.3",

From 897c7779fb53b7281be6cc9e61991281ee4be443 Mon Sep 17 00:00:00 2001
From: Mike <miguel@guumo.com>
Date: Sat, 6 May 2017 02:54:54 +0200
Subject: [PATCH 10/96] Add compileFileModule method (#2761)

* add module option in compileClientWithDependenciesTracked

* add module export and require pug runtime behaviour in compile method

* add module option

* add test case for module syntax

* remove module option

* add test

* fix option name

* Require `inlineRuntimeFunctions` to be explicitly false

* Use expect and add snapshot

* snapshot
---
 packages/pug/lib/index.js                     | 14 ++++++++--
 .../pug/test/__snapshots__/pug.test.js.snap   | 15 +++++++++++
 packages/pug/test/pug.test.js                 | 27 +++++++++++++++----
 3 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 packages/pug/test/__snapshots__/pug.test.js.snap

diff --git a/packages/pug/lib/index.js b/packages/pug/lib/index.js
index e8f0b48ac..a3c8968a5 100644
--- a/packages/pug/lib/index.js
+++ b/packages/pug/lib/index.js
@@ -276,6 +276,7 @@ exports.compile = function(str, options){
  *     the compiled template for better error messages.
  *   - `filename` used to improve errors when `compileDebug` is not `true` and to resolve imports/extends
  *   - `name` the name of the resulting function (defaults to "template")
+ *   - `module` when it is explicitly `true`, the source code include export module syntax
  *
  * @param {String} str
  * @param {Options} options
@@ -302,10 +303,19 @@ exports.compileClientWithDependenciesTracked = function(str, options){
     filters: options.filters,
     filterOptions: options.filterOptions,
     filterAliases: options.filterAliases,
-    plugins: options.plugins,
+    plugins: options.plugins
   });
 
-  return {body: parsed.body, dependencies: parsed.dependencies};
+  var body = parsed.body;
+
+  if(options.module) {
+    if(options.inlineRuntimeFunctions === false) {
+      body = 'var pug = require("pug-runtime");' + body;
+    }
+    body += ' module.exports = ' + (options.name || 'template') + ';';
+  }
+
+  return {body: body, dependencies: parsed.dependencies};
 };
 
 /**
diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
new file mode 100644
index 000000000..5ee3e8336
--- /dev/null
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -0,0 +1,15 @@
+exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false 1`] = `
+"var pug = require(\"pug-runtime\");function template(locals) {var pug_html = \"\", pug_mixins = {}, pug_interp;var pug_debug_filename, pug_debug_line;try {var self = locals || {};;pug_debug_line = 1;
+pug_html = pug_html + \"\\u003Cdiv class=\\\"bar\\\"\\u003E\";
+;pug_debug_line = 1;
+pug_html = pug_html + (pug.escape(null == (pug_interp = self.foo) ? \"\" : pug_interp)) + \"\\u003C\\u002Fdiv\\u003E\";} catch (err) {pug.rethrow(err, pug_debug_filename, pug_debug_line);};return pug_html;} module.exports = template;"
+`;
+
+exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true 1`] = `
+"function pug_escape(e){var a=\"\"+e,t=pug_match_html.exec(a);if(!t)return e;var r,c,n,s=\"\";for(r=t.index,c=0;r<a.length;r++){switch(a.charCodeAt(r)){case 34:n=\"&quot;\";break;case 38:n=\"&amp;\";break;case 60:n=\"&lt;\";break;case 62:n=\"&gt;\";break;default:continue}c!==r&&(s+=a.substring(c,r)),c=r+1,s+=n}return c!==r?s+a.substring(c,r):s}
+var pug_match_html=/[\"&<>]/;
+function pug_rethrow(n,e,r,t){if(!(n instanceof Error))throw n;if(!(\"undefined\"==typeof window&&e||t))throw n.message+=\" on line \"+r,n;try{t=t||require(\"fs\").readFileSync(e,\"utf8\")}catch(e){pug_rethrow(n,null,r)}var i=3,a=t.split(\"\\n\"),o=Math.max(r-i,0),h=Math.min(a.length,r+i),i=a.slice(o,h).map(function(n,e){var t=e+o+1;return(t==r?\"  > \":\"    \")+t+\"| \"+n}).join(\"\\n\");throw n.path=e,n.message=(e||\"Pug\")+\":\"+r+\"\\n\"+i+\"\\n\\n\"+n.message,n}function template(locals) {var pug_html = \"\", pug_mixins = {}, pug_interp;var pug_debug_filename, pug_debug_line;try {var self = locals || {};;pug_debug_line = 1;
+pug_html = pug_html + \"\\u003Cdiv class=\\\"bar\\\"\\u003E\";
+;pug_debug_line = 1;
+pug_html = pug_html + (pug_escape(null == (pug_interp = self.foo) ? \"\" : pug_interp)) + \"\\u003C\\u002Fdiv\\u003E\";} catch (err) {pug_rethrow(err, pug_debug_filename, pug_debug_line);};return pug_html;} module.exports = template;"
+`;
diff --git a/packages/pug/test/pug.test.js b/packages/pug/test/pug.test.js
index 608419d47..4fb073ae3 100644
--- a/packages/pug/test/pug.test.js
+++ b/packages/pug/test/pug.test.js
@@ -970,20 +970,37 @@ describe('pug', function(){
   });
 
   describe('.compileClient()', function () {
-    it('should support .pug.compileClient(str)', function () {
+    it('should support pug.compileClient(str)', function () {
       var src = fs.readFileSync(__dirname + '/cases/basic.pug');
       var expected = fs.readFileSync(__dirname + '/cases/basic.html', 'utf8').replace(/\s/g, '');
       var fn = pug.compileClient(src);
       fn = Function('pug', fn.toString() + '\nreturn template;')(pug.runtime);
       var actual = fn({name: 'foo'}).replace(/\s/g, '');
-      assert(actual === expected);
+      expect(actual).toBe(expected);
     });
-    it('should support .pug.compileClient(str, options)', function () {
-      var src = '.bar= self.foo'
+    it('should support pug.compileClient(str, options)', function () {
+      var src = '.bar= self.foo';
       var fn = pug.compileClient(src, {self: true});
       fn = Function('pug', fn.toString() + '\nreturn template;')(pug.runtime);
       var actual = fn({foo: 'baz'});
-      assert(actual === '<div class="bar">baz</div>');
+      expect(actual).toBe('<div class="bar">baz</div>');
+    });
+    it('should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true', function () {
+      var src = '.bar= self.foo';
+      var fn = pug.compileClient(src, {self: true, module: true, inlineRuntimeFunctions: true});
+      expect(fn).toMatchSnapshot();
+      fs.writeFileSync(__dirname + '/temp/input-compileModuleFileClient.js', fn);
+      var expected = '<div class="bar">baz</div>';
+      var fn = require(__dirname + '/temp/input-compileModuleFileClient.js');
+      expect(fn({foo: 'baz'})).toBe('<div class="bar">baz</div>');
+    });
+    it('should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false', function () {
+      var src = '.bar= self.foo';
+      var fn = pug.compileClient(src, {self: true, module: true, inlineRuntimeFunctions: false});
+      expect(fn).toMatchSnapshot();
+      fs.writeFileSync(__dirname + '/temp/input-compileModuleFileClient.js', fn);
+      var fn = require(__dirname + '/temp/input-compileModuleFileClient.js');
+      expect(fn({foo: 'baz'})).toBe('<div class="bar">baz</div>');
     });
   });
 

From ce24764124b2e22c927690f8d0b8af2c1ee33a9b Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Sat, 6 May 2017 02:15:28 +0100
Subject: [PATCH 11/96] Use prettier for JavaScript snapshots (#2797)

---
 package.json                                  | 12 ++-
 .../pug/test/__snapshots__/pug.test.js.snap   | 98 +++++++++++++++++--
 scripts/prettier-javascript-serializer.js     | 21 ++++
 3 files changed, 117 insertions(+), 14 deletions(-)
 create mode 100644 scripts/prettier-javascript-serializer.js

diff --git a/package.json b/package.json
index 0fa9d5e6d..b6eea874f 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,12 @@
   "devDependencies": {
     "coveralls": "^2.11.2",
     "jest": "^18.1.0",
-    "lerna": "2.0.0-beta.32"
+    "lerna": "2.0.0-beta.32",
+    "prettier": "^1.3.1"
   },
   "repository": {
-	   "type": "git",
-	   "url": "https://github.com/pugjs/pug.git"
+    "type": "git",
+    "url": "https://github.com/pugjs/pug.git"
   },
   "scripts": {
     "clean": "lerna clean",
@@ -22,7 +23,10 @@
   },
   "jest": {
     "testEnvironment": "node",
-    "snapshotSerializers": ["./scripts/filename-serializer.js"]
+    "snapshotSerializers": [
+      "./scripts/filename-serializer.js",
+      "./scripts/prettier-javascript-serializer.js"
+    ]
   },
   "license": "MIT"
 }
diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
index 5ee3e8336..c7c4f1f29 100644
--- a/packages/pug/test/__snapshots__/pug.test.js.snap
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -1,15 +1,93 @@
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false 1`] = `
-"var pug = require(\"pug-runtime\");function template(locals) {var pug_html = \"\", pug_mixins = {}, pug_interp;var pug_debug_filename, pug_debug_line;try {var self = locals || {};;pug_debug_line = 1;
-pug_html = pug_html + \"\\u003Cdiv class=\\\"bar\\\"\\u003E\";
-;pug_debug_line = 1;
-pug_html = pug_html + (pug.escape(null == (pug_interp = self.foo) ? \"\" : pug_interp)) + \"\\u003C\\u002Fdiv\\u003E\";} catch (err) {pug.rethrow(err, pug_debug_filename, pug_debug_line);};return pug_html;} module.exports = template;"
+"var pug = require(\"pug-runtime\");
+function template(locals) {
+  var pug_html = \"\", pug_mixins = {}, pug_interp;
+  var pug_debug_filename, pug_debug_line;
+  try {
+    var self = locals || {};
+    pug_debug_line = 1;
+    pug_html = pug_html + \'\\u003Cdiv class=\"bar\"\\u003E\';
+    pug_debug_line = 1;
+    pug_html =
+      pug_html +
+      pug.escape(null == (pug_interp = self.foo) ? \"\" : pug_interp) +
+      \"\\u003C\\u002Fdiv\\u003E\";
+  } catch (err) {
+    pug.rethrow(err, pug_debug_filename, pug_debug_line);
+  }
+  return pug_html;
+}
+module.exports = template;
+"
 `;
 
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true 1`] = `
-"function pug_escape(e){var a=\"\"+e,t=pug_match_html.exec(a);if(!t)return e;var r,c,n,s=\"\";for(r=t.index,c=0;r<a.length;r++){switch(a.charCodeAt(r)){case 34:n=\"&quot;\";break;case 38:n=\"&amp;\";break;case 60:n=\"&lt;\";break;case 62:n=\"&gt;\";break;default:continue}c!==r&&(s+=a.substring(c,r)),c=r+1,s+=n}return c!==r?s+a.substring(c,r):s}
-var pug_match_html=/[\"&<>]/;
-function pug_rethrow(n,e,r,t){if(!(n instanceof Error))throw n;if(!(\"undefined\"==typeof window&&e||t))throw n.message+=\" on line \"+r,n;try{t=t||require(\"fs\").readFileSync(e,\"utf8\")}catch(e){pug_rethrow(n,null,r)}var i=3,a=t.split(\"\\n\"),o=Math.max(r-i,0),h=Math.min(a.length,r+i),i=a.slice(o,h).map(function(n,e){var t=e+o+1;return(t==r?\"  > \":\"    \")+t+\"| \"+n}).join(\"\\n\");throw n.path=e,n.message=(e||\"Pug\")+\":\"+r+\"\\n\"+i+\"\\n\\n\"+n.message,n}function template(locals) {var pug_html = \"\", pug_mixins = {}, pug_interp;var pug_debug_filename, pug_debug_line;try {var self = locals || {};;pug_debug_line = 1;
-pug_html = pug_html + \"\\u003Cdiv class=\\\"bar\\\"\\u003E\";
-;pug_debug_line = 1;
-pug_html = pug_html + (pug_escape(null == (pug_interp = self.foo) ? \"\" : pug_interp)) + \"\\u003C\\u002Fdiv\\u003E\";} catch (err) {pug_rethrow(err, pug_debug_filename, pug_debug_line);};return pug_html;} module.exports = template;"
+"function pug_escape(e) {
+  var a = \"\" + e, t = pug_match_html.exec(a);
+  if (!t) return e;
+  var r, c, n, s = \"\";
+  for ((r = t.index), (c = 0); r < a.length; r++) {
+    switch (a.charCodeAt(r)) {
+      case 34:
+        n = \"&quot;\";
+        break;
+      case 38:
+        n = \"&amp;\";
+        break;
+      case 60:
+        n = \"&lt;\";
+        break;
+      case 62:
+        n = \"&gt;\";
+        break;
+      default:
+        continue;
+    }
+    c !== r && (s += a.substring(c, r)), (c = r + 1), (s += n);
+  }
+  return c !== r ? s + a.substring(c, r) : s;
+}
+var pug_match_html = /[\"&<>]/;
+function pug_rethrow(n, e, r, t) {
+  if (!(n instanceof Error)) throw n;
+  if (!((\"undefined\" == typeof window && e) || t))
+    throw ((n.message += \" on line \" + r), n);
+  try {
+    t = t || require(\"fs\").readFileSync(e, \"utf8\");
+  } catch (e) {
+    pug_rethrow(n, null, r);
+  }
+  var i = 3,
+    a = t.split(\"\\n\"),
+    o = Math.max(r - i, 0),
+    h = Math.min(a.length, r + i),
+    i = a
+      .slice(o, h)
+      .map(function(n, e) {
+        var t = e + o + 1;
+        return (t == r ? \"  > \" : \"    \") + t + \"| \" + n;
+      })
+      .join(\"\\n\");
+  throw ((n.path = e), (n.message =
+    (e || \"Pug\") + \":\" + r + \"\\n\" + i + \"\\n\\n\" + n.message), n);
+}
+function template(locals) {
+  var pug_html = \"\", pug_mixins = {}, pug_interp;
+  var pug_debug_filename, pug_debug_line;
+  try {
+    var self = locals || {};
+    pug_debug_line = 1;
+    pug_html = pug_html + \'\\u003Cdiv class=\"bar\"\\u003E\';
+    pug_debug_line = 1;
+    pug_html =
+      pug_html +
+      pug_escape(null == (pug_interp = self.foo) ? \"\" : pug_interp) +
+      \"\\u003C\\u002Fdiv\\u003E\";
+  } catch (err) {
+    pug_rethrow(err, pug_debug_filename, pug_debug_line);
+  }
+  return pug_html;
+}
+module.exports = template;
+"
 `;
diff --git a/scripts/prettier-javascript-serializer.js b/scripts/prettier-javascript-serializer.js
new file mode 100644
index 000000000..4a0630a22
--- /dev/null
+++ b/scripts/prettier-javascript-serializer.js
@@ -0,0 +1,21 @@
+const prettier = require('prettier');
+
+const prettierOptions = {} // optional
+
+// filename serializer that removes the basedir
+module.exports = {
+  test: function(val) {
+    try {
+      return (
+        typeof val === 'string' &&
+        /function /.test(val) &&
+        val !== prettier.format(val, prettierOptions)
+      );
+    } catch (ex) {
+      return false;
+    }
+  },
+  print: function(val, serialize, indent) {
+    return serialize(prettier.format(val, prettierOptions));
+  }
+};

From 319c9af71e43c9bd829798f9a9432cdc396b37d3 Mon Sep 17 00:00:00 2001
From: Matin Tamizi <mtamizi@gmail.com>
Date: Fri, 2 Jun 2017 01:02:37 -0700
Subject: [PATCH 12/96] More recent Python implementation (#2810)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4336e359b..5be0da332 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ Implementations in other languages:
   - [php](https://github.com/pug-php/pug)
   - [scala](https://scalate.github.io/scalate/documentation/scaml-reference.html)
   - [ruby](https://github.com/slim-template/slim)
-  - [python](https://github.com/SyrusAkbary/pyjade)
+  - [python](https://github.com/matannoam/pypugjs)
   - [java](https://github.com/neuland/jade4j)
 
 Other:

From 5bf0a65331ecec7566b961e7b1f45e693815b283 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Fri, 2 Jun 2017 13:31:55 +0100
Subject: [PATCH 13/96] [pug-parser] Remove excess blocks (#2812)

This has a tiny effect on the output of the pretty printed mode, but
mostly it just simplifies rendering for third things like react-pug.
---
 packages/pug-parser/index.js                  |  20 +-
 .../test/__snapshots__/index.test.js.snap     | 774 ++++++++----------
 .../no-unnecessary-blocks.test.js.snap        |  38 +
 .../test/no-unnecessary-blocks.test.js        |  14 +
 packages/pug/package.json                     |   2 +-
 packages/pug/test/cases/text.html             |   6 +-
 6 files changed, 430 insertions(+), 424 deletions(-)
 create mode 100644 packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
 create mode 100644 packages/pug-parser/test/no-unnecessary-blocks.test.js

diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index 818ee7fcf..863e7aeec 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -110,7 +110,13 @@ Parser.prototype = {
         block.nodes = block.nodes.concat(this.parseTextHtml());
       } else {
         var expr = this.parseExpr();
-        if (expr) block.nodes.push(expr);
+        if (expr) {
+          if (expr.type === 'Block') {
+            block.nodes = block.nodes.concat(expr.nodes);
+          } else {
+            block.nodes.push(expr);
+          }
+        }
       }
     }
 
@@ -382,7 +388,8 @@ loop:
   parseBlockExpansion: function(){
     var tok = this.accept(':');
     if (tok) {
-      return this.initBlock(tok.line, [this.parseExpr()]);
+      const expr = this.parseExpr();
+      return expr.type === 'Block' ? expr : this.initBlock(tok.line, [expr]);
     } else {
       return this.block();
     }
@@ -928,7 +935,11 @@ loop:
         block.nodes = block.nodes.concat(this.parseTextHtml());
       } else {
         var expr = this.parseExpr();
-        block.nodes.push(expr);
+        if (expr.type === 'Block') {
+          block.nodes = block.nodes.concat(expr.nodes);
+        } else {
+          block.nodes.push(expr);
+        }
       }
     }
     this.expect('outdent');
@@ -1044,7 +1055,8 @@ loop:
         break;
       case ':':
         this.advance();
-        tag.block = this.initBlock(tag.line, [this.parseExpr()]);
+        const expr = this.parseExpr();
+        tag.block = expr.type === 'Block' ? expr : this.initBlock(tag.line, [expr]);
         break;
       case 'newline':
       case 'indent':
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index 80d361002..4044b29d6 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -7097,17 +7097,10 @@ Object {
         "nodes": Array [
           Object {
             "filename": "html.tokens.json",
+            "isHtml": true,
             "line": 13,
-            "nodes": Array [
-              Object {
-                "filename": "html.tokens.json",
-                "isHtml": true,
-                "line": 13,
-                "type": "Text",
-                "val": "<strong>Even</strong> as the body of a block expansion.",
-              },
-            ],
-            "type": "Block",
+            "type": "Text",
+            "val": "<strong>Even</strong> as the body of a block expansion.",
           },
         ],
         "type": "Block",
@@ -9087,143 +9080,136 @@ Object {
           Object {
             "filename": "inline-tag.tokens.json",
             "line": 11,
-            "nodes": Array [
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 11,
-                "type": "Text",
-                "val": "bing",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 12,
-                "type": "Text",
-                "val": "
+            "type": "Text",
+            "val": "bing",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 12,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 12,
-                "type": "Text",
-                "val": "",
-              },
-              Object {
-                "attributeBlocks": Array [],
-                "attrs": Array [],
-                "block": Object {
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 12,
+            "type": "Text",
+            "val": "",
+          },
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [],
+            "block": Object {
+              "filename": "inline-tag.tokens.json",
+              "line": 12,
+              "nodes": Array [
+                Object {
                   "filename": "inline-tag.tokens.json",
                   "line": 12,
-                  "nodes": Array [
-                    Object {
-                      "filename": "inline-tag.tokens.json",
-                      "line": 12,
-                      "type": "Text",
-                      "val": "foo",
-                    },
-                  ],
-                  "type": "Block",
+                  "type": "Text",
+                  "val": "foo",
                 },
-                "filename": "inline-tag.tokens.json",
-                "isInline": true,
-                "line": 12,
-                "name": "strong",
-                "selfClosing": false,
-                "type": "Tag",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 12,
-                "type": "Text",
-                "val": "",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 13,
-                "type": "Text",
-                "val": "
+              ],
+              "type": "Block",
+            },
+            "filename": "inline-tag.tokens.json",
+            "isInline": true,
+            "line": 12,
+            "name": "strong",
+            "selfClosing": false,
+            "type": "Tag",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 12,
+            "type": "Text",
+            "val": "",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 13,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 13,
-                "type": "Text",
-                "val": "",
-              },
-              Object {
-                "attributeBlocks": Array [],
-                "attrs": Array [],
-                "block": Object {
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 13,
+            "type": "Text",
+            "val": "",
+          },
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [],
+            "block": Object {
+              "filename": "inline-tag.tokens.json",
+              "line": 13,
+              "nodes": Array [
+                Object {
+                  "buffer": true,
                   "filename": "inline-tag.tokens.json",
+                  "isInline": true,
                   "line": 13,
-                  "nodes": Array [
-                    Object {
-                      "buffer": true,
-                      "filename": "inline-tag.tokens.json",
-                      "isInline": true,
-                      "line": 13,
-                      "mustEscape": true,
-                      "type": "Code",
-                      "val": "\'[foo]\'",
-                    },
-                  ],
-                  "type": "Block",
+                  "mustEscape": true,
+                  "type": "Code",
+                  "val": "\'[foo]\'",
                 },
-                "filename": "inline-tag.tokens.json",
-                "isInline": true,
-                "line": 13,
-                "name": "strong",
-                "selfClosing": false,
-                "type": "Tag",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 13,
-                "type": "Text",
-                "val": "",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 14,
-                "type": "Text",
-                "val": "
+              ],
+              "type": "Block",
+            },
+            "filename": "inline-tag.tokens.json",
+            "isInline": true,
+            "line": 13,
+            "name": "strong",
+            "selfClosing": false,
+            "type": "Tag",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 13,
+            "type": "Text",
+            "val": "",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 14,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 14,
-                "type": "Text",
-                "val": "",
-              },
-              Object {
-                "buffer": false,
-                "filename": "inline-tag.tokens.json",
-                "isInline": false,
-                "line": 14,
-                "mustEscape": false,
-                "type": "Code",
-                "val": "var foo = \'foo]\'",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 14,
-                "type": "Text",
-                "val": "",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 15,
-                "type": "Text",
-                "val": "
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 14,
+            "type": "Text",
+            "val": "",
+          },
+          Object {
+            "buffer": false,
+            "filename": "inline-tag.tokens.json",
+            "isInline": false,
+            "line": 14,
+            "mustEscape": false,
+            "type": "Code",
+            "val": "var foo = \'foo]\'",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 14,
+            "type": "Text",
+            "val": "",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 15,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "inline-tag.tokens.json",
-                "line": 15,
-                "type": "Text",
-                "val": "bong",
-              },
-            ],
-            "type": "Block",
+          },
+          Object {
+            "filename": "inline-tag.tokens.json",
+            "line": 15,
+            "type": "Text",
+            "val": "bong",
           },
         ],
         "type": "Block",
@@ -9630,70 +9616,63 @@ Object {
           Object {
             "filename": "interpolation.escape.tokens.json",
             "line": 4,
-            "nodes": Array [
-              Object {
-                "filename": "interpolation.escape.tokens.json",
-                "line": 4,
-                "type": "Text",
-                "val": "some",
-              },
-              Object {
-                "filename": "interpolation.escape.tokens.json",
-                "line": 5,
-                "type": "Text",
-                "val": "
-",
-              },
-              Object {
-                "filename": "interpolation.escape.tokens.json",
-                "line": 5,
-                "type": "Text",
-                "val": "#{text}",
-              },
-              Object {
-                "filename": "interpolation.escape.tokens.json",
-                "line": 6,
-                "type": "Text",
-                "val": "
-",
-              },
-              Object {
-                "filename": "interpolation.escape.tokens.json",
-                "line": 6,
-                "type": "Text",
-                "val": "here",
-              },
-              Object {
-                "filename": "interpolation.escape.tokens.json",
-                "line": 7,
-                "type": "Text",
-                "val": "
+            "type": "Text",
+            "val": "some",
+          },
+          Object {
+            "filename": "interpolation.escape.tokens.json",
+            "line": 5,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "interpolation.escape.tokens.json",
-                "line": 7,
-                "type": "Text",
-                "val": "My ID ",
-              },
-              Object {
-                "buffer": true,
-                "filename": "interpolation.escape.tokens.json",
-                "isInline": true,
-                "line": 7,
-                "mustEscape": true,
-                "type": "Code",
-                "val": "\"is {\" + id + \"}\"",
-              },
-            ],
-            "type": "Block",
           },
-        ],
-        "type": "Block",
-      },
-      "filename": "interpolation.escape.tokens.json",
-      "isInline": false,
-      "line": 3,
+          Object {
+            "filename": "interpolation.escape.tokens.json",
+            "line": 5,
+            "type": "Text",
+            "val": "#{text}",
+          },
+          Object {
+            "filename": "interpolation.escape.tokens.json",
+            "line": 6,
+            "type": "Text",
+            "val": "
+",
+          },
+          Object {
+            "filename": "interpolation.escape.tokens.json",
+            "line": 6,
+            "type": "Text",
+            "val": "here",
+          },
+          Object {
+            "filename": "interpolation.escape.tokens.json",
+            "line": 7,
+            "type": "Text",
+            "val": "
+",
+          },
+          Object {
+            "filename": "interpolation.escape.tokens.json",
+            "line": 7,
+            "type": "Text",
+            "val": "My ID ",
+          },
+          Object {
+            "buffer": true,
+            "filename": "interpolation.escape.tokens.json",
+            "isInline": true,
+            "line": 7,
+            "mustEscape": true,
+            "type": "Code",
+            "val": "\"is {\" + id + \"}\"",
+          },
+        ],
+        "type": "Block",
+      },
+      "filename": "interpolation.escape.tokens.json",
+      "isInline": false,
+      "line": 3,
       "name": "foo",
       "selfClosing": false,
       "type": "Tag",
@@ -15300,47 +15279,40 @@ Object {
           Object {
             "filename": "tag-blocks.tokens.json",
             "line": 3,
-            "nodes": Array [
-              Object {
-                "filename": "tag-blocks.tokens.json",
-                "line": 3,
-                "type": "Text",
-                "val": "We have sent an e-mail to ",
-              },
-              Object {
-                "attributeBlocks": Array [],
-                "attrs": Array [],
-                "block": Object {
+            "type": "Text",
+            "val": "We have sent an e-mail to ",
+          },
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [],
+            "block": Object {
+              "filename": "tag-blocks.tokens.json",
+              "line": 3,
+              "nodes": Array [
+                Object {
+                  "buffer": true,
                   "filename": "tag-blocks.tokens.json",
+                  "isInline": true,
                   "line": 3,
-                  "nodes": Array [
-                    Object {
-                      "buffer": true,
-                      "filename": "tag-blocks.tokens.json",
-                      "isInline": true,
-                      "line": 3,
-                      "mustEscape": true,
-                      "type": "Code",
-                      "val": "this.props.email",
-                    },
-                  ],
-                  "type": "Block",
+                  "mustEscape": true,
+                  "type": "Code",
+                  "val": "this.props.email",
                 },
-                "filename": "tag-blocks.tokens.json",
-                "isInline": true,
-                "line": 3,
-                "name": "strong",
-                "selfClosing": false,
-                "type": "Tag",
-              },
-              Object {
-                "filename": "tag-blocks.tokens.json",
-                "line": 3,
-                "type": "Text",
-                "val": ".  Please click the link in the e-mail",
-              },
-            ],
-            "type": "Block",
+              ],
+              "type": "Block",
+            },
+            "filename": "tag-blocks.tokens.json",
+            "isInline": true,
+            "line": 3,
+            "name": "strong",
+            "selfClosing": false,
+            "type": "Tag",
+          },
+          Object {
+            "filename": "tag-blocks.tokens.json",
+            "line": 3,
+            "type": "Text",
+            "val": ".  Please click the link in the e-mail",
           },
           Object {
             "buffer": true,
@@ -15919,41 +15891,34 @@ Object {
           Object {
             "filename": "text.tokens.json",
             "line": 8,
-            "nodes": Array [
-              Object {
-                "filename": "text.tokens.json",
-                "line": 8,
-                "type": "Text",
-                "val": "foo",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 9,
-                "type": "Text",
-                "val": "
+            "type": "Text",
+            "val": "foo",
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 9,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 9,
-                "type": "Text",
-                "val": "bar",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 10,
-                "type": "Text",
-                "val": "
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 9,
+            "type": "Text",
+            "val": "bar",
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 10,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 10,
-                "type": "Text",
-                "val": "baz",
-              },
-            ],
-            "type": "Block",
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 10,
+            "type": "Text",
+            "val": "baz",
           },
         ],
         "type": "Block",
@@ -16044,71 +16009,64 @@ Object {
       "type": "Tag",
     },
     Object {
-      "filename": "text.tokens.json",
-      "line": 21,
-      "nodes": Array [
-        Object {
-          "line": 22,
-          "type": "Text",
-          "val": "foo",
-        },
-        Object {
-          "line": 23,
-          "type": "Text",
-          "val": "
+      "line": 22,
+      "type": "Text",
+      "val": "foo",
+    },
+    Object {
+      "line": 23,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 23,
-          "type": "Text",
-          "val": "",
-        },
-        Object {
-          "line": 24,
-          "type": "Text",
-          "val": "
+    },
+    Object {
+      "line": 23,
+      "type": "Text",
+      "val": "",
+    },
+    Object {
+      "line": 24,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 24,
-          "type": "Text",
-          "val": "",
-        },
-        Object {
-          "line": 25,
-          "type": "Text",
-          "val": "
+    },
+    Object {
+      "line": 24,
+      "type": "Text",
+      "val": "",
+    },
+    Object {
+      "line": 25,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 25,
-          "type": "Text",
-          "val": "bar",
-        },
-        Object {
-          "line": 26,
-          "type": "Text",
-          "val": "
+    },
+    Object {
+      "line": 25,
+      "type": "Text",
+      "val": "bar",
+    },
+    Object {
+      "line": 26,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 26,
-          "type": "Text",
-          "val": "baz",
-        },
-        Object {
-          "line": 27,
-          "type": "Text",
-          "val": "
+    },
+    Object {
+      "line": 26,
+      "type": "Text",
+      "val": "baz",
+    },
+    Object {
+      "line": 27,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 27,
-          "type": "Text",
-          "val": "",
-        },
-      ],
-      "type": "Block",
+    },
+    Object {
+      "line": 27,
+      "type": "Text",
+      "val": "",
     },
     Object {
       "attributeBlocks": Array [],
@@ -16120,54 +16078,47 @@ Object {
           Object {
             "filename": "text.tokens.json",
             "line": 29,
-            "nodes": Array [
-              Object {
-                "filename": "text.tokens.json",
-                "line": 29,
-                "type": "Text",
-                "val": "foo",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 30,
-                "type": "Text",
-                "val": "
+            "type": "Text",
+            "val": "foo",
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 30,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 30,
-                "type": "Text",
-                "val": "  bar",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 31,
-                "type": "Text",
-                "val": "
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 30,
+            "type": "Text",
+            "val": "  bar",
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 31,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 31,
-                "type": "Text",
-                "val": "    baz",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 32,
-                "type": "Text",
-                "val": "
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 31,
+            "type": "Text",
+            "val": "    baz",
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 32,
+            "type": "Text",
+            "val": "
 ",
-              },
-              Object {
-                "filename": "text.tokens.json",
-                "line": 32,
-                "type": "Text",
-                "val": ".",
-              },
-            ],
-            "type": "Block",
+          },
+          Object {
+            "filename": "text.tokens.json",
+            "line": 32,
+            "type": "Text",
+            "val": ".",
           },
         ],
         "type": "Block",
@@ -16247,49 +16198,42 @@ Object {
       "type": "Tag",
     },
     Object {
-      "filename": "text.tokens.json",
-      "line": 40,
-      "nodes": Array [
-        Object {
-          "line": 41,
-          "type": "Text",
-          "val": "foo",
-        },
-        Object {
-          "line": 42,
-          "type": "Text",
-          "val": "
+      "line": 41,
+      "type": "Text",
+      "val": "foo",
+    },
+    Object {
+      "line": 42,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 42,
-          "type": "Text",
-          "val": "  bar",
-        },
-        Object {
-          "line": 43,
-          "type": "Text",
-          "val": "
+    },
+    Object {
+      "line": 42,
+      "type": "Text",
+      "val": "  bar",
+    },
+    Object {
+      "line": 43,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 43,
-          "type": "Text",
-          "val": "    baz",
-        },
-        Object {
-          "line": 44,
-          "type": "Text",
-          "val": "
+    },
+    Object {
+      "line": 43,
+      "type": "Text",
+      "val": "    baz",
+    },
+    Object {
+      "line": 44,
+      "type": "Text",
+      "val": "
 ",
-        },
-        Object {
-          "line": 44,
-          "type": "Text",
-          "val": ".",
-        },
-      ],
-      "type": "Block",
+    },
+    Object {
+      "line": 44,
+      "type": "Text",
+      "val": ".",
     },
   ],
   "type": "Block",
diff --git a/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap b/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
new file mode 100644
index 000000000..0d1576139
--- /dev/null
+++ b/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
@@ -0,0 +1,38 @@
+exports[`test no uncessessary blocks should be added 1`] = `
+Object {
+  "line": 0,
+  "nodes": Array [
+    Object {
+      "attributeBlocks": Array [],
+      "attrs": Array [],
+      "block": Object {
+        "line": 2,
+        "nodes": Array [
+          Object {
+            "line": 3,
+            "type": "Text",
+            "val": "Hello",
+          },
+          Object {
+            "line": 4,
+            "type": "Text",
+            "val": "\n",
+          },
+          Object {
+            "line": 4,
+            "type": "Text",
+            "val": "World",
+          },
+        ],
+        "type": "Block",
+      },
+      "isInline": false,
+      "line": 2,
+      "name": "div",
+      "selfClosing": false,
+      "type": "Tag",
+    },
+  ],
+  "type": "Block",
+}
+`;
diff --git a/packages/pug-parser/test/no-unnecessary-blocks.test.js b/packages/pug-parser/test/no-unnecessary-blocks.test.js
new file mode 100644
index 000000000..30b5c7df4
--- /dev/null
+++ b/packages/pug-parser/test/no-unnecessary-blocks.test.js
@@ -0,0 +1,14 @@
+'use strict';
+
+var lex = require('pug-lexer');
+var parse = require('../');
+
+const input = `
+div
+  | Hello
+  | World
+`
+
+test('no uncessessary blocks should be added', () => {
+  expect(parse(lex(input))).toMatchSnapshot();
+});
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 727179e72..c65c63b2a 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -39,7 +39,7 @@
     "jstransformer-verbatim": "^1.0.0",
     "mkdirp": "^0.5.1",
     "rimraf": "^2.2.8",
-    "uglify-js": "mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
+    "uglify-js": "github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
   },
   "browser": {
     "fs": false
diff --git a/packages/pug/test/cases/text.html b/packages/pug/test/cases/text.html
index 6f0161570..0b0efb05c 100644
--- a/packages/pug/test/cases/text.html
+++ b/packages/pug/test/cases/text.html
@@ -16,8 +16,7 @@
   bar
   baz
   
-</p>
-foo
+</p>foo
 
 
 bar
@@ -31,8 +30,7 @@
   bar
     baz
 .
-</pre>
-foo
+</pre>foo
   bar
     baz
 .

From 851c634afe9b44029f3e3fd3f164a80b2bf7ce21 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Fri, 2 Jun 2017 13:33:27 +0100
Subject: [PATCH 14/96] Publish

 - pug-filters@2.1.3
 - pug-linker@3.0.1
 - pug-load@2.0.7
 - pug-parser@3.0.0
 - pug-walk@1.1.3
 - pug@2.0.0-rc.2
---
 packages/pug-filters/package.json |  8 ++++----
 packages/pug-linker/package.json  |  8 ++++----
 packages/pug-load/package.json    |  6 +++---
 packages/pug-parser/package.json  |  2 +-
 packages/pug-walk/package.json    |  4 ++--
 packages/pug/package.json         | 10 +++++-----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 31cc51b6b..4ed6b2998 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
@@ -9,7 +9,7 @@
     "clean-css": "^3.3.0",
     "constantinople": "^3.0.1",
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.2",
+    "pug-walk": "^1.1.3",
     "jstransformer": "1.0.0",
     "resolve": "^1.1.6",
     "uglify-js": "^2.6.1"
@@ -23,8 +23,8 @@
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
     "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.6",
-    "pug-parser": "^2.0.2"
+    "pug-load": "^2.0.7",
+    "pug-parser": "^3.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index 84141cfc5..bb2ac7e2c 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,18 +1,18 @@
 {
   "name": "pug-linker",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.2"
+    "pug-walk": "^1.1.3"
   },
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.6",
-    "pug-parser": "^2.0.2"
+    "pug-load": "^2.0.7",
+    "pug-parser": "^3.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index d3118869f..5bae9db8c 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -1,17 +1,17 @@
 {
   "name": "pug-load",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "The Pug loader is responsible for loading the depenendencies of a given Pug file.",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "object-assign": "^4.1.0",
-    "pug-walk": "^1.1.2"
+    "pug-walk": "^1.1.3"
   },
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-parser": "^2.0.2"
+    "pug-parser": "^3.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index 94912893f..c8a5e3daf 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-parser",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree)",
   "keywords": [
     "pug"
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index f3ba4b906..4550c8e56 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-walk",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Walk and transform a pug AST",
   "keywords": [
     "pug"
@@ -8,7 +8,7 @@
   "dependencies": {},
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-parser": "^2.0.2"
+    "pug-parser": "^3.0.0"
   },
   "files": [
     "index.js"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index c65c63b2a..515bc7fbd 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -21,11 +21,11 @@
   "main": "lib",
   "dependencies": {
     "pug-code-gen": "^1.1.1",
-    "pug-filters": "^2.1.2",
+    "pug-filters": "^2.1.3",
     "pug-lexer": "^3.1.0",
-    "pug-linker": "^3.0.0",
-    "pug-load": "^2.0.6",
-    "pug-parser": "^2.0.2",
+    "pug-linker": "^3.0.1",
+    "pug-load": "^2.0.7",
+    "pug-parser": "^3.0.0",
     "pug-runtime": "^2.0.3",
     "pug-strip-comments": "^1.0.2"
   },

From cf436ab808369a30973b425aafd55af872b31744 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 19 Jun 2017 23:31:16 +0100
Subject: [PATCH 15/96] Create ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..46a71f43f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,40 @@
+<!-- For bugs and feature request, please fillin the following -->
+<!-- For general questions, please use the pug tag on stack overflow: -->
+<!-- https://stackoverflow.com/questions/tagged/pug -->
+
+**Pug Version:** your version number here
+
+**Node Vesrion:** your version number here
+
+## Input JavaScript Values
+
+```js
+pug.renderFile('input.pug', {
+  whatIsIt: 'language',
+});
+```
+
+## Input Pug
+
+```pug
+h1 I Love Pug
+p It's a great #{whatIsIt}
+```
+
+## Expected HTML
+
+```html
+<h1>I Love Pug</h1>
+<p>It's a great language</p>
+```
+
+## Actual HTML
+
+```html
+<h1>I Love Pug</h1>
+<p>It's a great language</p>
+```
+
+## Additional Comments
+
+<!-- Please give us any additional details we'll need in order to understand the issue here -->

From 54b28caa404edfedb8ea3d94fe18008c64bc6dff Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 19 Jun 2017 23:51:33 +0100
Subject: [PATCH 16/96] Update tests for new prettier version

---
 .../pug/test/__snapshots__/pug.test.js.snap   | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
index c7c4f1f29..1d90c354a 100644
--- a/packages/pug/test/__snapshots__/pug.test.js.snap
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -1,7 +1,9 @@
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false 1`] = `
 "var pug = require(\"pug-runtime\");
 function template(locals) {
-  var pug_html = \"\", pug_mixins = {}, pug_interp;
+  var pug_html = \"\",
+    pug_mixins = {},
+    pug_interp;
   var pug_debug_filename, pug_debug_line;
   try {
     var self = locals || {};
@@ -23,10 +25,14 @@ module.exports = template;
 
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true 1`] = `
 "function pug_escape(e) {
-  var a = \"\" + e, t = pug_match_html.exec(a);
+  var a = \"\" + e,
+    t = pug_match_html.exec(a);
   if (!t) return e;
-  var r, c, n, s = \"\";
-  for ((r = t.index), (c = 0); r < a.length; r++) {
+  var r,
+    c,
+    n,
+    s = \"\";
+  for (r = t.index, c = 0; r < a.length; r++) {
     switch (a.charCodeAt(r)) {
       case 34:
         n = \"&quot;\";
@@ -68,11 +74,16 @@ function pug_rethrow(n, e, r, t) {
         return (t == r ? \"  > \" : \"    \") + t + \"| \" + n;
       })
       .join(\"\\n\");
-  throw ((n.path = e), (n.message =
-    (e || \"Pug\") + \":\" + r + \"\\n\" + i + \"\\n\\n\" + n.message), n);
+  throw (
+    (n.path = e),
+    (n.message = (e || \"Pug\") + \":\" + r + \"\\n\" + i + \"\\n\\n\" + n.message),
+    n
+  );
 }
 function template(locals) {
-  var pug_html = \"\", pug_mixins = {}, pug_interp;
+  var pug_html = \"\",
+    pug_mixins = {},
+    pug_interp;
   var pug_debug_filename, pug_debug_line;
   try {
     var self = locals || {};

From f4298ad2a70295e7965bc41659584151a2f9a2e8 Mon Sep 17 00:00:00 2001
From: Ryuma Yoshida <ryysud@users.noreply.github.com>
Date: Mon, 3 Jul 2017 11:18:19 +0900
Subject: [PATCH 17/96] Add Node.js v8 to Travis CI (#2836)

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 201e3ad85..63814d8db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: node_js
 node_js:
   - "4"
   - "6"
+  - "8"
 
 # Use faster Docker architecture on Travis.
 sudo: false

From e9dbadd0b392dce56bcb0b75aafff9e9dd90ed96 Mon Sep 17 00:00:00 2001
From: flamedoge <code.kchoi@gmail.com>
Date: Sun, 2 Jul 2017 22:30:35 -0400
Subject: [PATCH 18/96] replace const with var for use with 'strict' (#2827)

Some applications with older node fails due to strict not allowing 'const' or 'let' keywords.
---
 packages/pug-parser/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index 863e7aeec..274eef87c 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -388,7 +388,7 @@ loop:
   parseBlockExpansion: function(){
     var tok = this.accept(':');
     if (tok) {
-      const expr = this.parseExpr();
+      var expr = this.parseExpr();
       return expr.type === 'Block' ? expr : this.initBlock(tok.line, [expr]);
     } else {
       return this.block();
@@ -1055,7 +1055,7 @@ loop:
         break;
       case ':':
         this.advance();
-        const expr = this.parseExpr();
+        var expr = this.parseExpr();
         tag.block = expr.type === 'Block' ? expr : this.initBlock(tag.line, [expr]);
         break;
       case 'newline':

From 84a530d7c7347a0e1bcaaab61d99f048041df22d Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 1 Aug 2017 16:53:41 +0100
Subject: [PATCH 19/96] Publish

 - pug-filters@2.1.4
 - pug-linker@3.0.2
 - pug-load@2.0.8
 - pug-parser@3.0.1
 - pug-walk@1.1.4
 - pug@2.0.0-rc.3
---
 packages/pug-filters/package.json |  8 ++++----
 packages/pug-linker/package.json  |  8 ++++----
 packages/pug-load/package.json    |  6 +++---
 packages/pug-parser/package.json  |  2 +-
 packages/pug-walk/package.json    |  4 ++--
 packages/pug/package.json         | 10 +++++-----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 4ed6b2998..7163e4eaa 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
@@ -9,7 +9,7 @@
     "clean-css": "^3.3.0",
     "constantinople": "^3.0.1",
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.3",
+    "pug-walk": "^1.1.4",
     "jstransformer": "1.0.0",
     "resolve": "^1.1.6",
     "uglify-js": "^2.6.1"
@@ -23,8 +23,8 @@
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
     "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.7",
-    "pug-parser": "^3.0.0"
+    "pug-load": "^2.0.8",
+    "pug-parser": "^3.0.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index bb2ac7e2c..6a4a7df8c 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,18 +1,18 @@
 {
   "name": "pug-linker",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.3"
+    "pug-walk": "^1.1.4"
   },
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.7",
-    "pug-parser": "^3.0.0"
+    "pug-load": "^2.0.8",
+    "pug-parser": "^3.0.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index 5bae9db8c..c0e7e3c31 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -1,17 +1,17 @@
 {
   "name": "pug-load",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "The Pug loader is responsible for loading the depenendencies of a given Pug file.",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "object-assign": "^4.1.0",
-    "pug-walk": "^1.1.3"
+    "pug-walk": "^1.1.4"
   },
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-parser": "^3.0.0"
+    "pug-parser": "^3.0.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index c8a5e3daf..a70d04178 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-parser",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree)",
   "keywords": [
     "pug"
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index 4550c8e56..5bfe16ee8 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-walk",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Walk and transform a pug AST",
   "keywords": [
     "pug"
@@ -8,7 +8,7 @@
   "dependencies": {},
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-parser": "^3.0.0"
+    "pug-parser": "^3.0.1"
   },
   "files": [
     "index.js"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 515bc7fbd..4fcc931bc 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -21,11 +21,11 @@
   "main": "lib",
   "dependencies": {
     "pug-code-gen": "^1.1.1",
-    "pug-filters": "^2.1.3",
+    "pug-filters": "^2.1.4",
     "pug-lexer": "^3.1.0",
-    "pug-linker": "^3.0.1",
-    "pug-load": "^2.0.7",
-    "pug-parser": "^3.0.0",
+    "pug-linker": "^3.0.2",
+    "pug-load": "^2.0.8",
+    "pug-parser": "^3.0.1",
     "pug-runtime": "^2.0.3",
     "pug-strip-comments": "^1.0.2"
   },

From dc54da333c9316c0d7ffc09b71a32eff220c57bf Mon Sep 17 00:00:00 2001
From: Mitchell van Manen <ma.van.manen@live.nl>
Date: Tue, 1 Aug 2017 18:05:29 +0200
Subject: [PATCH 20/96] Added ASP.NET Core implementation (#2848)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5be0da332..d425a3961 100644
--- a/README.md
+++ b/README.md
@@ -150,6 +150,7 @@ Implementations in other languages:
   - [ruby](https://github.com/slim-template/slim)
   - [python](https://github.com/matannoam/pypugjs)
   - [java](https://github.com/neuland/jade4j)
+  - [C# ASP.NET Core](https://github.com/AspNetMonsters/pugzor)
 
 Other:
 

From fd97a0e6437c919db44254cfaba0721d24c6439d Mon Sep 17 00:00:00 2001
From: Joel Gallant <joel@joelgallant.me>
Date: Wed, 6 Sep 2017 08:06:47 -0600
Subject: [PATCH 21/96] Fixes typo in .github/ISSUE_TEMPLATE.md (#2852)

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 46a71f43f..91c7522f8 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -4,7 +4,7 @@
 
 **Pug Version:** your version number here
 
-**Node Vesrion:** your version number here
+**Node Version:** your version number here
 
 ## Input JavaScript Values
 

From 51437cee9332de107d54dc9936fb8df2bf5a5870 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 6 Sep 2017 23:15:41 +0900
Subject: [PATCH 22/96] Keep newline between text and interpolated-code (#2853)

---
 packages/pug-parser/index.js                  |  3 ++-
 .../test/__snapshots__/index.test.js.snap     | 22 +++++++++++++++++++
 .../pug-parser/test/cases/text.tokens.json    |  6 ++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index 274eef87c..5d8db7a0f 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -304,7 +304,8 @@ Parser.prototype = {
           case 'newline':
             if (!options || !options.block) break loop;
             var tok = this.advance();
-            if (this.peek().type === 'text') {
+            var nextType = this.peek().type;
+            if (nextType === 'text' || nextType === 'interpolated-code') {
               tags.push({
                 type: 'Text',
                 val: '\n',
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index 4044b29d6..432b53533 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -16235,6 +16235,28 @@ Object {
       "type": "Text",
       "val": ".",
     },
+    Object {
+      "filename": "text.tokens.json",
+      "line": 45,
+      "type": "Text",
+      "val": "foo",
+    },
+    Object {
+      "filename": "text.tokens.json",
+      "line": 46,
+      "type": "Text",
+      "val": "
+",
+    },
+    Object {
+      "buffer": true,
+      "filename": "text.tokens.json",
+      "isInline": true,
+      "line": 46,
+      "mustEscape": true,
+      "type": "Code",
+      "val": "bar",
+    },
   ],
   "type": "Block",
 }
diff --git a/packages/pug-parser/test/cases/text.tokens.json b/packages/pug-parser/test/cases/text.tokens.json
index fe38e52aa..50553de04 100644
--- a/packages/pug-parser/test/cases/text.tokens.json
+++ b/packages/pug-parser/test/cases/text.tokens.json
@@ -84,4 +84,8 @@
 {"type":"newline","line":44,"col":1}
 {"type":"text","line":44,"col":3,"val":"."}
 {"type":"end-pipeless-text","line":44,"col":4}
-{"type":"eos","line":44,"col":4}
\ No newline at end of file
+{"type":"newline","line":45,"col": 1}
+{"type":"text","line":45,"col": 3,"val":"foo"}
+{"type":"newline","line":46,"col": 1}
+{"type":"interpolated-code","line":46,"col":3,"val":"bar","mustEscape":true,"buffer":true}
+{"type":"eos","line":46,"col":9}

From 4182ad67ff425989aa4249a929d3f32e89af2bd6 Mon Sep 17 00:00:00 2001
From: droooney <d.vor7@mail.ru>
Date: Wed, 6 Sep 2017 19:32:33 +0500
Subject: [PATCH 23/96] Add column field to ast nodes; make attributeBlocks an
 array of nodes (#2834). (#2843)

---
 packages/pug-code-gen/index.js                |   17 +-
 .../__snapshots__/filter-aliases.test.js.snap |   40 +-
 ...ons-applied-to-nested-filters.test.js.snap |   13 +
 .../test/__snapshots__/index.test.js.snap     |   14 +
 packages/pug-parser/README.md                 |    4 +
 packages/pug-parser/index.js                  |   92 +-
 .../test/__snapshots__/index.test.js.snap     | 2483 ++++++++++++++++-
 .../no-unnecessary-blocks.test.js.snap        |    7 +-
 packages/pug-parser/try.js                    |   29 +
 packages/pug-walk/test/index.test.js          |   17 +-
 10 files changed, 2679 insertions(+), 37 deletions(-)
 create mode 100644 packages/pug-parser/try.js

diff --git a/packages/pug-code-gen/index.js b/packages/pug-code-gen/index.js
index 74dfcd080..9f578ef79 100644
--- a/packages/pug-code-gen/index.js
+++ b/packages/pug-code-gen/index.js
@@ -91,6 +91,7 @@ Compiler.prototype = {
   error: function (message, code, node) {
     var err = makeError(code, message, {
       line: node.line,
+      column: node.column,
       filename: node.filename,
     });
     throw err;
@@ -424,7 +425,7 @@ Compiler.prototype = {
     var args = mixin.args || '';
     var block = mixin.block;
     var attrs = mixin.attrs;
-    var attrsBlocks = mixin.attributeBlocks && mixin.attributeBlocks.slice();
+    var attrsBlocks = this.attributeBlocks(mixin.attributeBlocks);
     var pp = this.pp;
     var dynamic = mixin.name[0]==='#';
     var key = mixin.name;
@@ -543,7 +544,7 @@ Compiler.prototype = {
     if (tag.selfClosing || (!this.xml && selfClosing[tag.name])) {
       this.buffer('<');
       bufferName();
-      this.visitAttributes(tag.attrs, tag.attributeBlocks.slice());
+      this.visitAttributes(tag.attrs, this.attributeBlocks(tag.attributeBlocks));
       if (this.terse && !tag.selfClosing) {
         this.buffer('>');
       } else {
@@ -562,7 +563,7 @@ Compiler.prototype = {
       // Optimize attributes buffering
       this.buffer('<');
       bufferName();
-      this.visitAttributes(tag.attrs, tag.attributeBlocks.slice());
+      this.visitAttributes(tag.attrs, this.attributeBlocks(tag.attributeBlocks));
       this.buffer('>');
       if (tag.code) this.visitCode(tag.code);
       this.visit(tag.block, tag);
@@ -803,6 +804,16 @@ Compiler.prototype = {
       this.bufferExpression(res);
     }
     return res;
+  },
+
+  /**
+   * Compile attribute blocks.
+   */
+
+  attributeBlocks(attributeBlocks) {
+    return attributeBlocks && attributeBlocks.slice().map(function(attrBlock){
+      return attrBlock.val;
+    });
   }
 };
 
diff --git a/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap b/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap
index 640cc8634..2130c6572 100644
--- a/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap
+++ b/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap
@@ -23,28 +23,38 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 4,
                         "type": "Text",
                         "val": "function myFunc(foo) {",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 5,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 5,
                         "type": "Text",
                         "val": "  return foo;",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 6,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 6,
                         "type": "Text",
                         "val": "}",
@@ -52,6 +62,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                   "line": 3,
                   "name": "minify",
@@ -61,6 +72,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
             "line": 3,
             "name": "cdata",
@@ -70,6 +82,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
       "isInline": false,
       "line": 2,
@@ -107,28 +120,38 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 4,
                         "type": "Text",
                         "val": "function myFunc(foo) {",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 5,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 5,
                         "type": "Text",
                         "val": "  return foo;",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 6,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 6,
                         "type": "Text",
                         "val": "}",
@@ -136,6 +159,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                   "line": 3,
                   "name": "minify",
@@ -147,6 +171,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
             "line": 3,
             "name": "cdata",
@@ -168,28 +193,38 @@ Object {
                     "line": 7,
                     "nodes": Array [
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 8,
                         "type": "Text",
                         "val": "function myFunc(foo) {",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 9,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 9,
                         "type": "Text",
                         "val": "  return foo;",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 10,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                         "line": 10,
                         "type": "Text",
                         "val": "}",
@@ -197,6 +232,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
                   "line": 7,
                   "name": "uglify-js",
@@ -206,6 +242,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
             "line": 7,
             "name": "cdata",
@@ -215,6 +252,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
       "isInline": false,
       "line": 2,
@@ -230,7 +268,7 @@ Object {
 exports[`test we do not support chains of aliases 1`] = `
 Object {
   "code": "PUG:FILTER_ALISE_CHAIN",
-  "message": "<basedir>/packages/pug-filters/test/filter-aliases.test.js:3
+  "message": "<basedir>/packages/pug-filters/test/filter-aliases.test.js:3:9
 
 The filter \"minify-js\" is an alias for \"minify\", which is an alias for \"uglify-js\".  Pug does not support chains of filter aliases.",
 }
diff --git a/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap b/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap
index 579ad111a..c64988ced 100644
--- a/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap
+++ b/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap
@@ -23,28 +23,38 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
                         "line": 4,
                         "type": "Text",
                         "val": "function myFunc(foo) {",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
                         "line": 5,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
                         "line": 5,
                         "type": "Text",
                         "val": "  return foo;",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
                         "line": 6,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
                         "line": 6,
                         "type": "Text",
                         "val": "}",
@@ -52,6 +62,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
                   "line": 3,
                   "name": "uglify-js",
@@ -63,6 +74,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
             "line": 3,
             "name": "cdata",
@@ -74,6 +86,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
       "isInline": false,
       "line": 2,
diff --git a/packages/pug-load/test/__snapshots__/index.test.js.snap b/packages/pug-load/test/__snapshots__/index.test.js.snap
index 5df1e4bee..f7168dcbc 100644
--- a/packages/pug-load/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-load/test/__snapshots__/index.test.js.snap
@@ -4,12 +4,14 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
         "ast": Object {
           "filename": "<dirname>/bar.pug",
           "line": 0,
           "nodes": Array [
             Object {
+              "column": 1,
               "filename": "<dirname>/bar.pug",
               "line": 1,
               "mode": "replace",
@@ -20,6 +22,7 @@ Object {
           ],
           "type": "Block",
         },
+        "column": 9,
         "filename": "<dirname>/foo.pug",
         "fullPath": "<dirname>/bar.pug",
         "line": 1,
@@ -33,6 +36,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "<dirname>/foo.pug",
       "line": 3,
       "mode": "replace",
@@ -45,6 +49,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "file": Object {
             "ast": Object {
               "filename": "<dirname>/bing.pug",
@@ -54,6 +59,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 1,
+                      "filename": "<basedir>/packages/pug-load/test/bing.pug",
+                      "line": 1,
                       "mustEscape": false,
                       "name": "class",
                       "val": "\'bing\'",
@@ -64,6 +72,7 @@ Object {
                     "line": 1,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "<dirname>/bing.pug",
                         "line": 1,
                         "type": "Text",
@@ -72,6 +81,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 1,
                   "filename": "<dirname>/bing.pug",
                   "isInline": false,
                   "line": 1,
@@ -82,6 +92,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 11,
             "filename": "<dirname>/foo.pug",
             "fullPath": "<dirname>/bing.pug",
             "line": 4,
@@ -102,7 +113,9 @@ Object {
             "line": 5,
             "nodes": Array [
               Object {
+                "column": 5,
                 "file": Object {
+                  "column": 13,
                   "filename": "<dirname>/foo.pug",
                   "fullPath": "<dirname>/script.js",
                   "line": 6,
@@ -119,6 +132,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "<dirname>/foo.pug",
           "isInline": false,
           "line": 5,
diff --git a/packages/pug-parser/README.md b/packages/pug-parser/README.md
index 33b8a2b84..628e6dbd4 100644
--- a/packages/pug-parser/README.md
+++ b/packages/pug-parser/README.md
@@ -56,12 +56,16 @@ console.log(JSON.stringify(ast, null, '  '))
         {
           "name": "data-foo",
           "val": "\"bar\"",
+          "line": 1,
+          "column": 5,
+          "filename": "my-file.pug",
           "mustEscape": true
         }
       ],
       "attributeBlocks": [],
       "isInline": false,
       "line": 1,
+      "column": 1,
       "filename": "my-file.pug"
     }
   ],
diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index 5d8db7a0f..fe93b92e9 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -254,6 +254,7 @@ Parser.prototype = {
           type: 'tag',
           val: 'div',
           line: this.peek().line,
+          col: this.peek().col,
           filename: this.filename
         });
         return this.parseExpr();
@@ -286,6 +287,7 @@ Parser.prototype = {
               type: 'Text',
               val: tok.val,
               line: tok.line,
+              column: tok.col,
               filename: this.filename
             });
             break;
@@ -298,6 +300,7 @@ Parser.prototype = {
               mustEscape: tok.mustEscape !== false,
               isInline: true,
               line: tok.line,
+              column: tok.col,
               filename: this.filename
             });
             break;
@@ -310,6 +313,7 @@ Parser.prototype = {
                 type: 'Text',
                 val: '\n',
                 line: tok.line,
+                column: tok.col,
                 filename: this.filename
               });
             }
@@ -344,6 +348,7 @@ loop:
               val: text.val,
               filename: this.filename,
               line: text.line,
+              column: text.col,
               isHtml: true
             };
             nodes.push(currentNode);
@@ -402,7 +407,13 @@ loop:
 
   parseCase: function(){
     var tok = this.expect('case');
-    var node = {type: 'Case', expr: tok.val, line: tok.line, filename: this.filename};
+    var node = {
+      type: 'Case',
+      expr: tok.val,
+      line: tok.line,
+      column: tok.col,
+      filename: this.filename
+    };
 
     var block = this.emptyBlock(tok.line + 1);
     this.expect('indent');
@@ -445,6 +456,7 @@ loop:
         block: this.parseBlockExpansion(),
         debug: false,
         line: tok.line,
+        column: tok.col,
         filename: this.filename
       };
     } else {
@@ -453,6 +465,7 @@ loop:
         expr: tok.val,
         debug: false,
         line: tok.line,
+        column: tok.col,
         filename: this.filename
       };
     }
@@ -470,6 +483,7 @@ loop:
       block: this.parseBlockExpansion(),
       debug: false,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
   },
@@ -488,6 +502,7 @@ loop:
       mustEscape: tok.mustEscape !== false,
       isInline: !!noBlock,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
     // todo: why is this here?  It seems like a hacky workaround
@@ -516,6 +531,7 @@ loop:
       consequent: this.emptyBlock(tok.line),
       alternate: null,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
 
@@ -537,6 +553,7 @@ loop:
             consequent: this.emptyBlock(tok.line),
             alternate: null,
             line: tok.line,
+            column: tok.col,
             filename: this.filename
           }
         );
@@ -562,6 +579,7 @@ loop:
       type: 'While',
       test: tok.val,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
 
@@ -580,13 +598,15 @@ loop:
    */
 
   parseBlockCode: function(){
-    var line = this.expect('blockcode').line;
+    var tok = this.expect('blockcode');
+    var line = tok.line;
+    var column = tok.col;
     var body = this.peek();
     var text = '';
     if (body.type === 'start-pipeless-text') {
       this.advance();
       while (this.peek().type !== 'end-pipeless-text') {
-        var tok = this.advance();
+        tok = this.advance();
         switch (tok.type) {
           case 'text':
             text += tok.val;
@@ -612,6 +632,7 @@ loop:
       mustEscape: false,
       isInline: false,
       line: line,
+      column: column,
       filename: this.filename
     };
   },
@@ -629,6 +650,7 @@ loop:
         block: block,
         buffer: tok.buffer,
         line: tok.line,
+        column: tok.col,
         filename: this.filename
       };
     } else {
@@ -637,6 +659,7 @@ loop:
         val: tok.val,
         buffer: tok.buffer,
         line: tok.line,
+        column: tok.col,
         filename: this.filename
       };
     }
@@ -652,6 +675,7 @@ loop:
       type: 'Doctype',
       val: tok.val,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
   },
@@ -669,6 +693,7 @@ loop:
       name: tok.val,
       attrs: attrs,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
   },
@@ -692,6 +717,7 @@ loop:
           type: 'Text',
           val: textToken.val,
           line: textToken.line,
+          column: textToken.col,
           filename: this.filename
         }
       ]);
@@ -707,6 +733,7 @@ loop:
       block: block,
       attrs: attrs,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
   },
@@ -724,6 +751,7 @@ loop:
       key: tok.key,
       block: this.block(),
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
     if (this.peek().type == 'else') {
@@ -745,10 +773,12 @@ loop:
       file: {
         type: 'FileReference',
         path: path.val.trim(),
-        line: tok.line,
+        line: path.line,
+        column: path.col,
         filename: this.filename
       },
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
   },
@@ -765,6 +795,7 @@ loop:
     node.name = tok.val.trim();
     node.mode = tok.mode;
     node.line = tok.line;
+    node.column = tok.col;
 
     return node;
   },
@@ -774,12 +805,22 @@ loop:
     if (!this.inMixin) {
       this.error('BLOCK_OUTISDE_MIXIN', 'Anonymous blocks are not allowed unless they are part of a mixin.', tok);
     }
-    return {type: 'MixinBlock', line: tok.line, filename: this.filename};
+    return {
+      type: 'MixinBlock',
+      line: tok.line,
+      column: tok.col,
+      filename: this.filename
+    };
   },
 
   parseYield: function() {
     var tok = this.expect('yield');
-    return {type: 'YieldBlock', line: tok.line, filename: this.filename};
+    return {
+      type: 'YieldBlock',
+      line: tok.line,
+      column: tok.col,
+      filename: this.filename
+    };
   },
 
   /**
@@ -792,10 +833,10 @@ loop:
       type: 'Include',
       file: {
         type: 'FileReference',
-        line: tok.line,
         filename: this.filename
       },
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
     var filters = [];
@@ -805,6 +846,8 @@ loop:
     var path = this.expect('path');
 
     node.file.path = path.val.trim();
+    node.file.line = path.line;
+    node.file.column = path.col;
 
     if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !filters.length) {
       node.block = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.line);
@@ -841,6 +884,7 @@ loop:
       attrs: [],
       attributeBlocks: [],
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
 
@@ -871,6 +915,7 @@ loop:
         block: this.block(),
         call: false,
         line: tok.line,
+        column: tok.col,
         filename: this.filename
       };
       this.inMixin--;
@@ -892,10 +937,22 @@ loop:
       var tok = this.advance();
       switch (tok.type) {
         case 'text':
-          block.nodes.push({type: 'Text', val: tok.val, line: tok.line});
+          block.nodes.push({
+            type: 'Text',
+            val: tok.val,
+            line: tok.line,
+            column: tok.col,
+            filename: this.filename
+          });
           break;
         case 'newline':
-          block.nodes.push({type: 'Text', val: '\n', line: tok.line});
+          block.nodes.push({
+            type: 'Text',
+            val: '\n',
+            line: tok.line,
+            column: tok.col,
+            filename: this.filename
+          });
           break;
         case 'start-pug-interpolation':
           block.nodes.push(this.parseExpr());
@@ -909,6 +966,7 @@ loop:
             mustEscape: tok.mustEscape !== false,
             isInline: true,
             line: tok.line,
+            column: tok.col,
             filename: this.filename
           });
           break;
@@ -962,6 +1020,7 @@ loop:
       attributeBlocks: [],
       isInline: false,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
 
@@ -983,6 +1042,7 @@ loop:
       attributeBlocks: [],
       isInline: inlineTags.indexOf(tok.val) !== -1,
       line: tok.line,
+      column: tok.col,
       filename: this.filename
     };
 
@@ -1013,6 +1073,9 @@ loop:
             tag.attrs.push({
               name: tok.type,
               val: "'" + tok.val + "'",
+              line: tok.line,
+              column: tok.col,
+              filename: this.filename,
               mustEscape: false
             });
             continue;
@@ -1025,7 +1088,13 @@ loop:
             continue;
           case '&attributes':
             var tok = this.advance();
-            tag.attributeBlocks.push(tok.val);
+            tag.attributeBlocks.push({
+              type: 'AttributeBlock',
+              val: tok.val,
+              line: tok.line,
+              column: tok.col,
+              filename: this.filename
+            });
             break;
           default:
             var pluginResult = this.runPlugin('tagAttributeTokens', this.peek(), tag, attributeNames);
@@ -1109,6 +1178,9 @@ loop:
       attrs.push({
         name: tok.name,
         val: tok.val,
+        line: tok.line,
+        column: tok.col,
+        filename: this.filename,
         mustEscape: tok.mustEscape !== false
       });
       tok = this.advance();
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index 432b53533..4fb3c80eb 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -5,6 +5,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "attr-es2015.tokens.json",
       "isInline": false,
       "line": 1,
@@ -16,11 +17,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 4,
+          "filename": "attr-es2015.tokens.json",
+          "line": 3,
           "mustEscape": false,
           "name": "class",
           "val": "\'avatar-div\'",
         },
         Object {
+          "column": 16,
+          "filename": "attr-es2015.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "style",
           "val": "\`background-image: url(https://www.gravatar.com/avatar/\${avatar})\`",
@@ -32,6 +39,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attr-es2015.tokens.json",
       "isInline": false,
       "line": 3,
@@ -51,6 +59,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": false,
       "line": 1,
@@ -60,6 +69,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": false,
       "line": 2,
@@ -71,11 +81,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.js.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "href",
           "val": "\'/user/\' + id",
         },
         Object {
+          "column": 23,
+          "filename": "attrs.js.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "class",
           "val": "\'button\'",
@@ -87,6 +103,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 3,
@@ -98,11 +115,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.js.tokens.json",
+          "line": 4,
           "mustEscape": true,
           "name": "href",
           "val": "\'/user/\' + id",
         },
         Object {
+          "column": 27,
+          "filename": "attrs.js.tokens.json",
+          "line": 4,
           "mustEscape": true,
           "name": "class",
           "val": "\'button\'",
@@ -114,6 +137,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 4,
@@ -125,11 +149,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 6,
+          "filename": "attrs.js.tokens.json",
+          "line": 5,
           "mustEscape": true,
           "name": "key",
           "val": "\'answer\'",
         },
         Object {
+          "column": 20,
+          "filename": "attrs.js.tokens.json",
+          "line": 5,
           "mustEscape": true,
           "name": "value",
           "val": "answer()",
@@ -141,6 +171,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": false,
       "line": 5,
@@ -152,6 +183,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.js.tokens.json",
+          "line": 6,
           "mustEscape": true,
           "name": "class",
           "val": "[\'class1\', \'class2\']",
@@ -163,6 +197,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 6,
@@ -174,11 +209,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 2,
+          "filename": "attrs.js.tokens.json",
+          "line": 7,
           "mustEscape": false,
           "name": "class",
           "val": "\'tag-class\'",
         },
         Object {
+          "column": 13,
+          "filename": "attrs.js.tokens.json",
+          "line": 7,
           "mustEscape": true,
           "name": "class",
           "val": "[\'class1\', \'class2\']",
@@ -190,6 +231,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 7,
@@ -201,11 +243,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.js.tokens.json",
+          "line": 9,
           "mustEscape": true,
           "name": "href",
           "val": "\'/user/\' + id",
         },
         Object {
+          "column": 22,
+          "filename": "attrs.js.tokens.json",
+          "line": 9,
           "mustEscape": true,
           "name": "class",
           "val": "\'button\'",
@@ -217,6 +265,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 9,
@@ -228,11 +277,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.js.tokens.json",
+          "line": 10,
           "mustEscape": true,
           "name": "href",
           "val": "\'/user/\' + id",
         },
         Object {
+          "column": 26,
+          "filename": "attrs.js.tokens.json",
+          "line": 10,
           "mustEscape": true,
           "name": "class",
           "val": "\'button\'",
@@ -244,6 +299,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 10,
@@ -255,11 +311,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 6,
+          "filename": "attrs.js.tokens.json",
+          "line": 11,
           "mustEscape": true,
           "name": "key",
           "val": "\'answer\'",
         },
         Object {
+          "column": 19,
+          "filename": "attrs.js.tokens.json",
+          "line": 11,
           "mustEscape": true,
           "name": "value",
           "val": "answer()",
@@ -271,6 +333,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": false,
       "line": 11,
@@ -282,6 +345,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.js.tokens.json",
+          "line": 12,
           "mustEscape": true,
           "name": "class",
           "val": "[\'class1\', \'class2\']",
@@ -293,6 +359,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 12,
@@ -304,11 +371,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 2,
+          "filename": "attrs.js.tokens.json",
+          "line": 13,
           "mustEscape": false,
           "name": "class",
           "val": "\'tag-class\'",
         },
         Object {
+          "column": 13,
+          "filename": "attrs.js.tokens.json",
+          "line": 13,
           "mustEscape": true,
           "name": "class",
           "val": "[\'class1\', \'class2\']",
@@ -320,6 +393,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": true,
       "line": 13,
@@ -329,10 +403,19 @@ Object {
     },
     Object {
       "attributeBlocks": Array [
-        "{foo: \'bar\'}",
+        Object {
+          "column": 11,
+          "filename": "attrs.js.tokens.json",
+          "line": 15,
+          "type": "AttributeBlock",
+          "val": "{foo: \'bar\'}",
+        },
       ],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.js.tokens.json",
+          "line": 15,
           "mustEscape": true,
           "name": "id",
           "val": "id",
@@ -344,6 +427,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": false,
       "line": 15,
@@ -353,6 +437,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": false,
       "line": 16,
@@ -362,15 +447,27 @@ Object {
     },
     Object {
       "attributeBlocks": Array [
-        "{baz: \'baz\'}",
+        Object {
+          "column": 22,
+          "filename": "attrs.js.tokens.json",
+          "line": 17,
+          "type": "AttributeBlock",
+          "val": "{baz: \'baz\'}",
+        },
       ],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.js.tokens.json",
+          "line": 17,
           "mustEscape": true,
           "name": "foo",
           "val": "null",
         },
         Object {
+          "column": 14,
+          "filename": "attrs.js.tokens.json",
+          "line": 17,
           "mustEscape": true,
           "name": "bar",
           "val": "bar",
@@ -382,6 +479,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.js.tokens.json",
       "isInline": false,
       "line": 17,
@@ -403,6 +501,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "href",
           "val": "\'/contact\'",
@@ -413,6 +514,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 20,
             "filename": "attrs.tokens.json",
             "line": 1,
             "type": "Text",
@@ -421,6 +523,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 1,
@@ -432,11 +535,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 2,
           "mustEscape": true,
           "name": "href",
           "val": "\'/save\'",
         },
         Object {
+          "column": 16,
+          "filename": "attrs.tokens.json",
+          "line": 2,
           "mustEscape": false,
           "name": "class",
           "val": "\'button\'",
@@ -447,6 +556,7 @@ Object {
         "line": 2,
         "nodes": Array [
           Object {
+            "column": 24,
             "filename": "attrs.tokens.json",
             "line": 2,
             "type": "Text",
@@ -455,6 +565,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 2,
@@ -466,16 +577,25 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "foo",
           "val": true,
         },
         Object {
+          "column": 8,
+          "filename": "attrs.tokens.json",
+          "line": 3,
           "mustEscape": false,
           "name": "bar",
           "val": true,
         },
         Object {
+          "column": 13,
+          "filename": "attrs.tokens.json",
+          "line": 3,
           "mustEscape": false,
           "name": "baz",
           "val": true,
@@ -487,6 +607,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 3,
@@ -498,11 +619,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 4,
           "mustEscape": true,
           "name": "foo",
           "val": "\'foo, bar, baz\'",
         },
         Object {
+          "column": 24,
+          "filename": "attrs.tokens.json",
+          "line": 4,
           "mustEscape": true,
           "name": "bar",
           "val": "1",
@@ -514,6 +641,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 4,
@@ -525,11 +653,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 5,
           "mustEscape": true,
           "name": "foo",
           "val": "\'((foo))\'",
         },
         Object {
+          "column": 18,
+          "filename": "attrs.tokens.json",
+          "line": 5,
           "mustEscape": true,
           "name": "bar",
           "val": "(1) ? 1 : 0",
@@ -541,6 +675,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 5,
@@ -559,11 +694,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "attrs.tokens.json",
+                "line": 7,
                 "mustEscape": true,
                 "name": "value",
                 "val": "\'foo\'",
               },
               Object {
+                "column": 23,
+                "filename": "attrs.tokens.json",
+                "line": 7,
                 "mustEscape": false,
                 "name": "selected",
                 "val": true,
@@ -574,6 +715,7 @@ Object {
               "line": 7,
               "nodes": Array [
                 Object {
+                  "column": 33,
                   "filename": "attrs.tokens.json",
                   "line": 7,
                   "type": "Text",
@@ -582,6 +724,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "attrs.tokens.json",
             "isInline": false,
             "line": 7,
@@ -593,11 +736,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "attrs.tokens.json",
+                "line": 8,
                 "mustEscape": true,
                 "name": "selected",
                 "val": true,
               },
               Object {
+                "column": 20,
+                "filename": "attrs.tokens.json",
+                "line": 8,
                 "mustEscape": true,
                 "name": "value",
                 "val": "\'bar\'",
@@ -608,6 +757,7 @@ Object {
               "line": 8,
               "nodes": Array [
                 Object {
+                  "column": 33,
                   "filename": "attrs.tokens.json",
                   "line": 8,
                   "type": "Text",
@@ -616,6 +766,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "attrs.tokens.json",
             "isInline": false,
             "line": 8,
@@ -626,6 +777,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 6,
@@ -637,6 +789,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 9,
           "mustEscape": true,
           "name": "foo",
           "val": "\"class:\"",
@@ -648,6 +803,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 9,
@@ -659,6 +815,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "attrs.tokens.json",
+          "line": 10,
           "mustEscape": true,
           "name": "pattern",
           "val": "\'\\\\S+\'",
@@ -670,6 +829,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 10,
@@ -681,6 +841,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 12,
           "mustEscape": true,
           "name": "href",
           "val": "\'/contact\'",
@@ -691,6 +854,7 @@ Object {
         "line": 12,
         "nodes": Array [
           Object {
+            "column": 20,
             "filename": "attrs.tokens.json",
             "line": 12,
             "type": "Text",
@@ -699,6 +863,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 12,
@@ -710,11 +875,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 13,
           "mustEscape": true,
           "name": "href",
           "val": "\'/save\'",
         },
         Object {
+          "column": 16,
+          "filename": "attrs.tokens.json",
+          "line": 13,
           "mustEscape": false,
           "name": "class",
           "val": "\'button\'",
@@ -725,6 +896,7 @@ Object {
         "line": 13,
         "nodes": Array [
           Object {
+            "column": 24,
             "filename": "attrs.tokens.json",
             "line": 13,
             "type": "Text",
@@ -733,6 +905,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 13,
@@ -744,16 +917,25 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 14,
           "mustEscape": true,
           "name": "foo",
           "val": true,
         },
         Object {
+          "column": 7,
+          "filename": "attrs.tokens.json",
+          "line": 14,
           "mustEscape": false,
           "name": "bar",
           "val": true,
         },
         Object {
+          "column": 11,
+          "filename": "attrs.tokens.json",
+          "line": 14,
           "mustEscape": false,
           "name": "baz",
           "val": true,
@@ -765,6 +947,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 14,
@@ -776,11 +959,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 15,
           "mustEscape": true,
           "name": "foo",
           "val": "\'foo, bar, baz\'",
         },
         Object {
+          "column": 23,
+          "filename": "attrs.tokens.json",
+          "line": 15,
           "mustEscape": true,
           "name": "bar",
           "val": "1",
@@ -792,6 +981,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 15,
@@ -803,11 +993,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 16,
           "mustEscape": true,
           "name": "foo",
           "val": "\'((foo))\'",
         },
         Object {
+          "column": 17,
+          "filename": "attrs.tokens.json",
+          "line": 16,
           "mustEscape": true,
           "name": "bar",
           "val": "(1) ? 1 : 0",
@@ -819,6 +1015,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 16,
@@ -837,11 +1034,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "attrs.tokens.json",
+                "line": 18,
                 "mustEscape": true,
                 "name": "value",
                 "val": "\'foo\'",
               },
               Object {
+                "column": 22,
+                "filename": "attrs.tokens.json",
+                "line": 18,
                 "mustEscape": false,
                 "name": "selected",
                 "val": true,
@@ -852,6 +1055,7 @@ Object {
               "line": 18,
               "nodes": Array [
                 Object {
+                  "column": 32,
                   "filename": "attrs.tokens.json",
                   "line": 18,
                   "type": "Text",
@@ -860,6 +1064,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "attrs.tokens.json",
             "isInline": false,
             "line": 18,
@@ -871,11 +1076,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "attrs.tokens.json",
+                "line": 19,
                 "mustEscape": true,
                 "name": "selected",
                 "val": true,
               },
               Object {
+                "column": 19,
+                "filename": "attrs.tokens.json",
+                "line": 19,
                 "mustEscape": true,
                 "name": "value",
                 "val": "\'bar\'",
@@ -886,6 +1097,7 @@ Object {
               "line": 19,
               "nodes": Array [
                 Object {
+                  "column": 32,
                   "filename": "attrs.tokens.json",
                   "line": 19,
                   "type": "Text",
@@ -894,6 +1106,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "attrs.tokens.json",
             "isInline": false,
             "line": 19,
@@ -904,6 +1117,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 17,
@@ -915,6 +1129,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 20,
           "mustEscape": true,
           "name": "foo",
           "val": "\"class:\"",
@@ -926,6 +1143,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 20,
@@ -937,6 +1155,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "attrs.tokens.json",
+          "line": 21,
           "mustEscape": true,
           "name": "pattern",
           "val": "\'\\\\S+\'",
@@ -948,6 +1169,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 21,
@@ -959,6 +1181,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 22,
           "mustEscape": true,
           "name": "terse",
           "val": "\"true\"",
@@ -970,6 +1195,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 22,
@@ -981,6 +1207,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 23,
           "mustEscape": true,
           "name": "date",
           "val": "new Date(0)",
@@ -992,6 +1221,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 23,
@@ -1003,11 +1233,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 25,
           "mustEscape": true,
           "name": "abc",
           "val": true,
         },
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 26,
           "mustEscape": false,
           "name": "def",
           "val": true,
@@ -1019,6 +1255,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 25,
@@ -1030,11 +1267,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 27,
           "mustEscape": true,
           "name": "abc",
           "val": true,
         },
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 28,
           "mustEscape": false,
           "name": "def",
           "val": true,
@@ -1046,6 +1289,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 27,
@@ -1057,11 +1301,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 29,
           "mustEscape": true,
           "name": "abc",
           "val": true,
         },
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 30,
           "mustEscape": false,
           "name": "def",
           "val": true,
@@ -1073,6 +1323,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 29,
@@ -1084,11 +1335,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 31,
           "mustEscape": true,
           "name": "abc",
           "val": true,
         },
         Object {
+          "column": 4,
+          "filename": "attrs.tokens.json",
+          "line": 32,
           "mustEscape": false,
           "name": "def",
           "val": true,
@@ -1100,6 +1357,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 31,
@@ -1111,11 +1369,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 33,
           "mustEscape": true,
           "name": "abc",
           "val": true,
         },
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 34,
           "mustEscape": false,
           "name": "def",
           "val": true,
@@ -1127,6 +1391,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 33,
@@ -1138,11 +1403,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 35,
           "mustEscape": true,
           "name": "abc",
           "val": true,
         },
         Object {
+          "column": 5,
+          "filename": "attrs.tokens.json",
+          "line": 36,
           "mustEscape": false,
           "name": "def",
           "val": true,
@@ -1154,6 +1425,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 35,
@@ -1163,6 +1435,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 38,
@@ -1172,7 +1445,13 @@ Object {
     },
     Object {
       "attributeBlocks": Array [
-        "attrs",
+        Object {
+          "column": 4,
+          "filename": "attrs.tokens.json",
+          "line": 40,
+          "type": "AttributeBlock",
+          "val": "attrs",
+        },
       ],
       "attrs": Array [],
       "block": Object {
@@ -1181,6 +1460,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": false,
       "line": 40,
@@ -1192,11 +1472,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 42,
           "mustEscape": true,
           "name": "foo",
           "val": "\'foo\'",
         },
         Object {
+          "column": 14,
+          "filename": "attrs.tokens.json",
+          "line": 42,
           "mustEscape": true,
           "name": "bar",
           "val": "\"bar\"",
@@ -1208,6 +1494,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 42,
@@ -1219,11 +1506,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "attrs.tokens.json",
+          "line": 43,
           "mustEscape": true,
           "name": "foo",
           "val": "\'foo\'",
         },
         Object {
+          "column": 14,
+          "filename": "attrs.tokens.json",
+          "line": 43,
           "mustEscape": true,
           "name": "bar",
           "val": "\'bar\'",
@@ -1235,6 +1528,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.tokens.json",
       "isInline": true,
       "line": 43,
@@ -1256,6 +1550,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 8,
+          "filename": "attrs.unescaped.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "type",
           "val": "\'text/x-template\'",
@@ -1269,6 +1566,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "attrs.unescaped.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'user-<%= user.id %>\'",
@@ -1286,6 +1586,7 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "attrs.unescaped.tokens.json",
                         "line": 3,
                         "type": "Text",
@@ -1294,6 +1595,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "attrs.unescaped.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -1304,6 +1606,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "attrs.unescaped.tokens.json",
             "isInline": false,
             "line": 2,
@@ -1314,6 +1617,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs.unescaped.tokens.json",
       "isInline": false,
       "line": 1,
@@ -1333,6 +1637,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "attrs-data.tokens.json",
       "isInline": false,
       "line": 1,
@@ -1344,6 +1649,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs-data.tokens.json",
+          "line": 2,
           "mustEscape": true,
           "name": "data-user",
           "val": "user",
@@ -1355,6 +1663,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs-data.tokens.json",
       "isInline": false,
       "line": 2,
@@ -1366,6 +1675,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs-data.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "data-items",
           "val": "[1,2,3]",
@@ -1377,6 +1689,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs-data.tokens.json",
       "isInline": false,
       "line": 3,
@@ -1388,6 +1701,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs-data.tokens.json",
+          "line": 4,
           "mustEscape": true,
           "name": "data-username",
           "val": "\'tobi\'",
@@ -1399,6 +1715,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs-data.tokens.json",
       "isInline": false,
       "line": 4,
@@ -1410,6 +1727,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs-data.tokens.json",
+          "line": 5,
           "mustEscape": true,
           "name": "data-escaped",
           "val": "{message: \"Let\'s rock!\"}",
@@ -1421,6 +1741,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs-data.tokens.json",
       "isInline": false,
       "line": 5,
@@ -1432,6 +1753,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs-data.tokens.json",
+          "line": 6,
           "mustEscape": true,
           "name": "data-ampersand",
           "val": "{message: \"a quote: &quot; this & that\"}",
@@ -1443,6 +1767,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs-data.tokens.json",
       "isInline": false,
       "line": 6,
@@ -1454,6 +1779,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "attrs-data.tokens.json",
+          "line": 7,
           "mustEscape": true,
           "name": "data-epoc",
           "val": "new Date(0)",
@@ -1465,6 +1793,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "attrs-data.tokens.json",
       "isInline": false,
       "line": 7,
@@ -1504,6 +1833,7 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "basic.tokens.json",
                         "line": 3,
                         "type": "Text",
@@ -1512,6 +1842,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "basic.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -1522,6 +1853,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "basic.tokens.json",
             "isInline": false,
             "line": 2,
@@ -1532,6 +1864,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "basic.tokens.json",
       "isInline": false,
       "line": 1,
@@ -1564,6 +1897,7 @@ Object {
               "line": 4,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "blanks.tokens.json",
                   "line": 4,
                   "type": "Text",
@@ -1572,6 +1906,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "blanks.tokens.json",
             "isInline": false,
             "line": 4,
@@ -1587,6 +1922,7 @@ Object {
               "line": 6,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "blanks.tokens.json",
                   "line": 6,
                   "type": "Text",
@@ -1595,6 +1931,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "blanks.tokens.json",
             "isInline": false,
             "line": 6,
@@ -1610,6 +1947,7 @@ Object {
               "line": 8,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "blanks.tokens.json",
                   "line": 8,
                   "type": "Text",
@@ -1618,6 +1956,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "blanks.tokens.json",
             "isInline": false,
             "line": 8,
@@ -1628,6 +1967,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "blanks.tokens.json",
       "isInline": false,
       "line": 3,
@@ -1647,6 +1987,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "block-code.tokens.json",
       "isInline": false,
       "line": 1,
@@ -1657,6 +1998,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "block-code.tokens.json",
       "line": 4,
       "type": "Comment",
@@ -1664,6 +2006,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "block-code.tokens.json",
       "isInline": false,
       "line": 5,
@@ -1678,6 +2021,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": false,
+            "column": 3,
             "filename": "block-code.tokens.json",
             "isInline": false,
             "line": 7,
@@ -1697,6 +2041,7 @@ item.slice(1);",
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 5,
                   "filename": "block-code.tokens.json",
                   "isInline": true,
                   "line": 12,
@@ -1707,6 +2052,7 @@ item.slice(1);",
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "block-code.tokens.json",
             "isInline": false,
             "line": 12,
@@ -1717,6 +2063,7 @@ item.slice(1);",
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "block-code.tokens.json",
       "key": null,
       "line": 6,
@@ -1745,6 +2092,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 5,
+                "filename": "block-expansion.shorthands.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'list-item\'",
@@ -1758,6 +2108,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 17,
+                      "filename": "block-expansion.shorthands.tokens.json",
+                      "line": 2,
                       "mustEscape": false,
                       "name": "class",
                       "val": "\'foo\'",
@@ -1771,6 +2124,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 23,
+                            "filename": "block-expansion.shorthands.tokens.json",
+                            "line": 2,
                             "mustEscape": false,
                             "name": "id",
                             "val": "\'bar\'",
@@ -1781,6 +2137,7 @@ Object {
                           "line": 2,
                           "nodes": Array [
                             Object {
+                              "column": 28,
                               "filename": "block-expansion.shorthands.tokens.json",
                               "line": 2,
                               "type": "Text",
@@ -1789,6 +2146,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 23,
                         "filename": "block-expansion.shorthands.tokens.json",
                         "isInline": false,
                         "line": 2,
@@ -1799,6 +2157,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 17,
                   "filename": "block-expansion.shorthands.tokens.json",
                   "isInline": false,
                   "line": 2,
@@ -1809,6 +2168,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "block-expansion.shorthands.tokens.json",
             "isInline": false,
             "line": 2,
@@ -1819,6 +2179,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "block-expansion.shorthands.tokens.json",
       "isInline": false,
       "line": 1,
@@ -1854,6 +2215,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 9,
+                      "filename": "block-expansion.tokens.json",
+                      "line": 2,
                       "mustEscape": true,
                       "name": "href",
                       "val": "\'#\'",
@@ -1864,6 +2228,7 @@ Object {
                     "line": 2,
                     "nodes": Array [
                       Object {
+                        "column": 19,
                         "filename": "block-expansion.tokens.json",
                         "line": 2,
                         "type": "Text",
@@ -1872,6 +2237,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 7,
                   "filename": "block-expansion.tokens.json",
                   "isInline": true,
                   "line": 2,
@@ -1882,6 +2248,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "block-expansion.tokens.json",
             "isInline": false,
             "line": 2,
@@ -1900,6 +2267,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 9,
+                      "filename": "block-expansion.tokens.json",
+                      "line": 3,
                       "mustEscape": true,
                       "name": "href",
                       "val": "\'#\'",
@@ -1910,6 +2280,7 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 19,
                         "filename": "block-expansion.tokens.json",
                         "line": 3,
                         "type": "Text",
@@ -1918,6 +2289,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 7,
                   "filename": "block-expansion.tokens.json",
                   "isInline": true,
                   "line": 3,
@@ -1928,6 +2300,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "block-expansion.tokens.json",
             "isInline": false,
             "line": 3,
@@ -1938,6 +2311,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "block-expansion.tokens.json",
       "isInline": false,
       "line": 1,
@@ -1953,6 +2327,7 @@ Object {
         "line": 5,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "block-expansion.tokens.json",
             "line": 5,
             "type": "Text",
@@ -1961,6 +2336,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "block-expansion.tokens.json",
       "isInline": false,
       "line": 5,
@@ -1993,6 +2369,7 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 7,
                   "filename": "blockquote.tokens.json",
                   "line": 3,
                   "type": "Text",
@@ -2001,6 +2378,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "blockquote.tokens.json",
             "isInline": false,
             "line": 2,
@@ -2016,6 +2394,7 @@ Object {
               "line": 4,
               "nodes": Array [
                 Object {
+                  "column": 14,
                   "filename": "blockquote.tokens.json",
                   "line": 4,
                   "type": "Text",
@@ -2024,6 +2403,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "blockquote.tokens.json",
             "isInline": false,
             "line": 4,
@@ -2034,6 +2414,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "blockquote.tokens.json",
       "isInline": false,
       "line": 1,
@@ -2052,7 +2433,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "blocks-in-blocks.tokens.json",
         "line": 1,
         "path": "./auxiliary/blocks-in-blocks-layout.pug",
@@ -2063,6 +2446,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "blocks-in-blocks.tokens.json",
       "line": 3,
       "mode": "replace",
@@ -2076,6 +2460,7 @@ Object {
             "line": 4,
             "nodes": Array [
               Object {
+                "column": 6,
                 "filename": "blocks-in-blocks.tokens.json",
                 "line": 4,
                 "type": "Text",
@@ -2084,6 +2469,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "blocks-in-blocks.tokens.json",
           "isInline": false,
           "line": 4,
@@ -2106,6 +2492,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "blocks-in-if.tokens.json",
       "line": 1,
       "type": "Comment",
@@ -2113,6 +2500,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "blocks-in-if.tokens.json",
       "isInline": false,
       "line": 3,
@@ -2127,12 +2515,14 @@ Object {
         "nodes": Array [
           Object {
             "buffer": false,
+            "column": 5,
             "filename": "blocks-in-if.tokens.json",
             "line": 6,
             "type": "Comment",
             "val": " return only contents if ajax requests",
           },
           Object {
+            "column": 5,
             "filename": "blocks-in-if.tokens.json",
             "line": 7,
             "mode": "replace",
@@ -2146,6 +2536,7 @@ Object {
                   "line": 8,
                   "nodes": Array [
                     Object {
+                      "column": 11,
                       "filename": "blocks-in-if.tokens.json",
                       "line": 8,
                       "type": "Text",
@@ -2154,6 +2545,7 @@ Object {
                   ],
                   "type": "Block",
                 },
+                "column": 9,
                 "filename": "blocks-in-if.tokens.json",
                 "isInline": false,
                 "line": 8,
@@ -2168,6 +2560,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "filename": "blocks-in-if.tokens.json",
       "isInline": false,
       "line": 5,
@@ -2182,12 +2575,14 @@ Object {
         "nodes": Array [
           Object {
             "buffer": false,
+            "column": 5,
             "filename": "blocks-in-if.tokens.json",
             "line": 11,
             "type": "Comment",
             "val": " return all html",
           },
           Object {
+            "column": 5,
             "filename": "blocks-in-if.tokens.json",
             "line": 12,
             "type": "Doctype",
@@ -2211,6 +2606,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 19,
+                            "filename": "blocks-in-if.tokens.json",
+                            "line": 15,
                             "mustEscape": true,
                             "name": "charset",
                             "val": "\'utf8\'",
@@ -2222,6 +2620,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 13,
                         "filename": "blocks-in-if.tokens.json",
                         "isInline": false,
                         "line": 15,
@@ -2237,6 +2636,7 @@ Object {
                           "line": 16,
                           "nodes": Array [
                             Object {
+                              "column": 19,
                               "filename": "blocks-in-if.tokens.json",
                               "line": 16,
                               "type": "Text",
@@ -2245,6 +2645,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 13,
                         "filename": "blocks-in-if.tokens.json",
                         "isInline": false,
                         "line": 16,
@@ -2260,6 +2661,7 @@ Object {
                           "line": 17,
                           "nodes": Array [
                             Object {
+                              "column": 17,
                               "filename": "blocks-in-if.tokens.json",
                               "line": 18,
                               "mode": "replace",
@@ -2273,6 +2675,7 @@ Object {
                                     "line": 19,
                                     "nodes": Array [
                                       Object {
+                                        "column": 23,
                                         "filename": "blocks-in-if.tokens.json",
                                         "line": 19,
                                         "type": "Text",
@@ -2281,6 +2684,7 @@ Object {
                                     ],
                                     "type": "Block",
                                   },
+                                  "column": 21,
                                   "filename": "blocks-in-if.tokens.json",
                                   "isInline": false,
                                   "line": 19,
@@ -2294,6 +2698,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 13,
                         "filename": "blocks-in-if.tokens.json",
                         "isInline": false,
                         "line": 17,
@@ -2304,6 +2709,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "blocks-in-if.tokens.json",
                   "isInline": false,
                   "line": 14,
@@ -2314,6 +2720,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 5,
             "filename": "blocks-in-if.tokens.json",
             "isInline": false,
             "line": 13,
@@ -2325,6 +2732,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "debug": false,
       "filename": "blocks-in-if.tokens.json",
       "isInline": false,
@@ -2359,6 +2767,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": false,
+                  "column": 5,
                   "filename": "case.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -2384,6 +2793,7 @@ Object {
                                 "line": 5,
                                 "nodes": Array [
                                   Object {
+                                    "column": 17,
                                     "filename": "case.tokens.json",
                                     "line": 5,
                                     "type": "Text",
@@ -2392,6 +2802,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 15,
                               "filename": "case.tokens.json",
                               "isInline": false,
                               "line": 5,
@@ -2402,6 +2813,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "0",
                         "filename": "case.tokens.json",
@@ -2421,6 +2833,7 @@ Object {
                                 "line": 6,
                                 "nodes": Array [
                                   Object {
+                                    "column": 17,
                                     "filename": "case.tokens.json",
                                     "line": 6,
                                     "type": "Text",
@@ -2429,6 +2842,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 15,
                               "filename": "case.tokens.json",
                               "isInline": false,
                               "line": 6,
@@ -2439,6 +2853,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "1",
                         "filename": "case.tokens.json",
@@ -2458,6 +2873,7 @@ Object {
                                 "line": 7,
                                 "nodes": Array [
                                   Object {
+                                    "column": 18,
                                     "filename": "case.tokens.json",
                                     "line": 7,
                                     "type": "Text",
@@ -2465,6 +2881,7 @@ Object {
                                   },
                                   Object {
                                     "buffer": true,
+                                    "column": 27,
                                     "filename": "case.tokens.json",
                                     "isInline": true,
                                     "line": 7,
@@ -2473,6 +2890,7 @@ Object {
                                     "val": "friends",
                                   },
                                   Object {
+                                    "column": 37,
                                     "filename": "case.tokens.json",
                                     "line": 7,
                                     "type": "Text",
@@ -2481,6 +2899,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 16,
                               "filename": "case.tokens.json",
                               "isInline": false,
                               "line": 7,
@@ -2491,6 +2910,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "default",
                         "filename": "case.tokens.json",
@@ -2500,6 +2920,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "expr": "friends",
                   "filename": "case.tokens.json",
                   "line": 4,
@@ -2507,6 +2928,7 @@ Object {
                 },
                 Object {
                   "buffer": false,
+                  "column": 5,
                   "filename": "case.tokens.json",
                   "isInline": false,
                   "line": 8,
@@ -2520,6 +2942,7 @@ Object {
                     "line": 10,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "debug": false,
                         "expr": "0",
                         "filename": "case.tokens.json",
@@ -2539,6 +2962,7 @@ Object {
                                 "line": 12,
                                 "nodes": Array [
                                   Object {
+                                    "column": 11,
                                     "filename": "case.tokens.json",
                                     "line": 12,
                                     "type": "Text",
@@ -2547,6 +2971,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "case.tokens.json",
                               "isInline": false,
                               "line": 12,
@@ -2557,6 +2982,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "1",
                         "filename": "case.tokens.json",
@@ -2576,6 +3002,7 @@ Object {
                                 "line": 14,
                                 "nodes": Array [
                                   Object {
+                                    "column": 11,
                                     "filename": "case.tokens.json",
                                     "line": 14,
                                     "type": "Text",
@@ -2583,6 +3010,7 @@ Object {
                                   },
                                   Object {
                                     "buffer": true,
+                                    "column": 20,
                                     "filename": "case.tokens.json",
                                     "isInline": true,
                                     "line": 14,
@@ -2591,6 +3019,7 @@ Object {
                                     "val": "friends",
                                   },
                                   Object {
+                                    "column": 30,
                                     "filename": "case.tokens.json",
                                     "line": 14,
                                     "type": "Text",
@@ -2599,6 +3028,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "case.tokens.json",
                               "isInline": false,
                               "line": 14,
@@ -2609,6 +3039,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "default",
                         "filename": "case.tokens.json",
@@ -2618,6 +3049,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "expr": "friends",
                   "filename": "case.tokens.json",
                   "line": 9,
@@ -2626,6 +3058,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "case.tokens.json",
             "isInline": false,
             "line": 2,
@@ -2636,6 +3069,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "case.tokens.json",
       "isInline": false,
       "line": 1,
@@ -2669,6 +3103,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": false,
+                  "column": 5,
                   "filename": "case-blocks.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -2694,6 +3129,7 @@ Object {
                                 "line": 6,
                                 "nodes": Array [
                                   Object {
+                                    "column": 11,
                                     "filename": "case-blocks.tokens.json",
                                     "line": 6,
                                     "type": "Text",
@@ -2702,6 +3138,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "case-blocks.tokens.json",
                               "isInline": false,
                               "line": 6,
@@ -2712,6 +3149,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "0",
                         "filename": "case-blocks.tokens.json",
@@ -2731,6 +3169,7 @@ Object {
                                 "line": 8,
                                 "nodes": Array [
                                   Object {
+                                    "column": 11,
                                     "filename": "case-blocks.tokens.json",
                                     "line": 8,
                                     "type": "Text",
@@ -2739,6 +3178,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "case-blocks.tokens.json",
                               "isInline": false,
                               "line": 8,
@@ -2749,6 +3189,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "1",
                         "filename": "case-blocks.tokens.json",
@@ -2768,6 +3209,7 @@ Object {
                                 "line": 10,
                                 "nodes": Array [
                                   Object {
+                                    "column": 11,
                                     "filename": "case-blocks.tokens.json",
                                     "line": 10,
                                     "type": "Text",
@@ -2775,6 +3217,7 @@ Object {
                                   },
                                   Object {
                                     "buffer": true,
+                                    "column": 20,
                                     "filename": "case-blocks.tokens.json",
                                     "isInline": true,
                                     "line": 10,
@@ -2783,6 +3226,7 @@ Object {
                                     "val": "friends",
                                   },
                                   Object {
+                                    "column": 30,
                                     "filename": "case-blocks.tokens.json",
                                     "line": 10,
                                     "type": "Text",
@@ -2791,6 +3235,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "case-blocks.tokens.json",
                               "isInline": false,
                               "line": 10,
@@ -2801,6 +3246,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "debug": false,
                         "expr": "default",
                         "filename": "case-blocks.tokens.json",
@@ -2810,6 +3256,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "expr": "friends",
                   "filename": "case-blocks.tokens.json",
                   "line": 4,
@@ -2818,6 +3265,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "case-blocks.tokens.json",
             "isInline": false,
             "line": 2,
@@ -2828,6 +3276,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "case-blocks.tokens.json",
       "isInline": false,
       "line": 1,
@@ -2849,6 +3298,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "classes.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "class",
           "val": "[\'foo\', \'bar\', \'baz\']",
@@ -2860,6 +3312,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "classes.tokens.json",
       "isInline": true,
       "line": 1,
@@ -2871,16 +3324,25 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 2,
+          "filename": "classes.tokens.json",
+          "line": 5,
           "mustEscape": false,
           "name": "class",
           "val": "\'foo\'",
         },
         Object {
+          "column": 7,
+          "filename": "classes.tokens.json",
+          "line": 5,
           "mustEscape": true,
           "name": "class",
           "val": "\'bar\'",
         },
         Object {
+          "column": 19,
+          "filename": "classes.tokens.json",
+          "line": 5,
           "mustEscape": false,
           "name": "class",
           "val": "\'baz\'",
@@ -2892,6 +3354,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "classes.tokens.json",
       "isInline": true,
       "line": 5,
@@ -2903,6 +3366,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 2,
+          "filename": "classes.tokens.json",
+          "line": 9,
           "mustEscape": false,
           "name": "class",
           "val": "\'foo-bar_baz\'",
@@ -2914,6 +3380,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "classes.tokens.json",
       "isInline": true,
       "line": 9,
@@ -2925,6 +3392,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "classes.tokens.json",
+          "line": 11,
           "mustEscape": true,
           "name": "class",
           "val": "{foo: true, bar: false, baz: true}",
@@ -2936,6 +3406,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "classes.tokens.json",
       "isInline": true,
       "line": 11,
@@ -2957,6 +3428,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "classes-empty.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "class",
           "val": "\'\'",
@@ -2968,6 +3442,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "classes-empty.tokens.json",
       "isInline": true,
       "line": 1,
@@ -2979,6 +3454,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "classes-empty.tokens.json",
+          "line": 2,
           "mustEscape": true,
           "name": "class",
           "val": "null",
@@ -2990,6 +3468,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "classes-empty.tokens.json",
       "isInline": true,
       "line": 2,
@@ -3001,6 +3480,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "classes-empty.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "class",
           "val": "undefined",
@@ -3012,6 +3494,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "classes-empty.tokens.json",
       "isInline": true,
       "line": 3,
@@ -3042,6 +3525,7 @@ Object {
               "line": 3,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 3,
                   "type": "Text",
@@ -3050,6 +3534,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 3,
@@ -3061,6 +3546,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "filename": "code.conditionals.tokens.json",
       "isInline": false,
       "line": 2,
@@ -3081,6 +3567,7 @@ Object {
               "line": 5,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 5,
                   "type": "Text",
@@ -3089,6 +3576,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 5,
@@ -3100,6 +3588,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "debug": false,
       "filename": "code.conditionals.tokens.json",
       "isInline": false,
@@ -3121,6 +3610,7 @@ Object {
               "line": 8,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 8,
                   "type": "Text",
@@ -3129,6 +3619,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 8,
@@ -3140,6 +3631,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "filename": "code.conditionals.tokens.json",
       "isInline": false,
       "line": 7,
@@ -3160,6 +3652,7 @@ Object {
               "line": 10,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 10,
                   "type": "Text",
@@ -3168,6 +3661,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 10,
@@ -3179,6 +3673,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "filename": "code.conditionals.tokens.json",
       "isInline": false,
       "line": 9,
@@ -3188,6 +3683,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.conditionals.tokens.json",
       "isInline": false,
       "line": 11,
@@ -3208,6 +3704,7 @@ Object {
               "line": 18,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 18,
                   "type": "Text",
@@ -3216,6 +3713,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 18,
@@ -3226,6 +3724,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "consequent": Object {
         "filename": "code.conditionals.tokens.json",
         "line": 14,
@@ -3238,6 +3737,7 @@ Object {
               "line": 14,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 14,
                   "type": "Text",
@@ -3246,6 +3746,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 14,
@@ -3261,6 +3762,7 @@ Object {
               "line": 15,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 15,
                   "type": "Text",
@@ -3269,6 +3771,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 15,
@@ -3284,6 +3787,7 @@ Object {
               "line": 16,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 16,
                   "type": "Text",
@@ -3292,6 +3796,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 16,
@@ -3320,6 +3825,7 @@ Object {
               "line": 23,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 23,
                   "type": "Text",
@@ -3328,6 +3834,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 23,
@@ -3338,6 +3845,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "consequent": Object {
         "filename": "code.conditionals.tokens.json",
         "line": 21,
@@ -3350,6 +3858,7 @@ Object {
               "line": 21,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "line": 21,
                   "type": "Text",
@@ -3358,6 +3867,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 21,
@@ -3375,12 +3885,14 @@ Object {
     },
     Object {
       "alternate": null,
+      "column": 1,
       "consequent": Object {
         "filename": "code.conditionals.tokens.json",
         "line": 26,
         "nodes": Array [
           Object {
             "alternate": null,
+            "column": 3,
             "consequent": Object {
               "filename": "code.conditionals.tokens.json",
               "line": 27,
@@ -3393,6 +3905,7 @@ Object {
                     "line": 27,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "code.conditionals.tokens.json",
                         "line": 27,
                         "type": "Text",
@@ -3401,6 +3914,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "code.conditionals.tokens.json",
                   "isInline": false,
                   "line": 27,
@@ -3426,6 +3940,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.conditionals.tokens.json",
       "line": 29,
       "type": "Comment",
@@ -3440,6 +3955,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "code.conditionals.tokens.json",
+                "line": 32,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'bar\'",
@@ -3451,6 +3969,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 32,
@@ -3461,6 +3980,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "consequent": Object {
         "filename": "code.conditionals.tokens.json",
         "line": 30,
@@ -3474,6 +3994,7 @@ Object {
     },
     Object {
       "alternate": null,
+      "column": 1,
       "consequent": Object {
         "filename": "code.conditionals.tokens.json",
         "line": 34,
@@ -3482,6 +4003,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "code.conditionals.tokens.json",
+                "line": 34,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'bar\'",
@@ -3493,6 +4017,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 34,
@@ -3512,6 +4037,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 1,
+          "filename": "code.conditionals.tokens.json",
+          "line": 36,
           "mustEscape": false,
           "name": "class",
           "val": "\'bing\'",
@@ -3523,6 +4051,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.conditionals.tokens.json",
       "isInline": false,
       "line": 36,
@@ -3540,6 +4069,9 @@ Object {
               "attributeBlocks": Array [],
               "attrs": Array [
                 Object {
+                  "column": 3,
+                  "filename": "code.conditionals.tokens.json",
+                  "line": 43,
                   "mustEscape": false,
                   "name": "class",
                   "val": "\'foo\'",
@@ -3551,6 +4083,7 @@ Object {
                 "nodes": Array [],
                 "type": "Block",
               },
+              "column": 3,
               "filename": "code.conditionals.tokens.json",
               "isInline": false,
               "line": 43,
@@ -3561,6 +4094,7 @@ Object {
           ],
           "type": "Block",
         },
+        "column": 1,
         "consequent": Object {
           "filename": "code.conditionals.tokens.json",
           "line": 41,
@@ -3569,6 +4103,9 @@ Object {
               "attributeBlocks": Array [],
               "attrs": Array [
                 Object {
+                  "column": 3,
+                  "filename": "code.conditionals.tokens.json",
+                  "line": 41,
                   "mustEscape": false,
                   "name": "class",
                   "val": "\'bar\'",
@@ -3580,6 +4117,7 @@ Object {
                 "nodes": Array [],
                 "type": "Block",
               },
+              "column": 3,
               "filename": "code.conditionals.tokens.json",
               "isInline": false,
               "line": 41,
@@ -3595,6 +4133,7 @@ Object {
         "test": "false",
         "type": "Conditional",
       },
+      "column": 1,
       "consequent": Object {
         "filename": "code.conditionals.tokens.json",
         "line": 39,
@@ -3603,6 +4142,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "code.conditionals.tokens.json",
+                "line": 39,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'bing\'",
@@ -3614,6 +4156,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.conditionals.tokens.json",
             "isInline": false,
             "line": 39,
@@ -3648,6 +4191,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 2,
             "filename": "code.escape.tokens.json",
             "isInline": true,
             "line": 1,
@@ -3658,6 +4202,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.escape.tokens.json",
       "isInline": false,
       "line": 1,
@@ -3674,6 +4219,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 2,
             "filename": "code.escape.tokens.json",
             "isInline": true,
             "line": 2,
@@ -3684,6 +4230,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.escape.tokens.json",
       "isInline": false,
       "line": 2,
@@ -3703,6 +4250,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 2,
@@ -3731,6 +4279,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "code.iteration.tokens.json",
                         "isInline": true,
                         "line": 6,
@@ -3741,6 +4290,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "code.iteration.tokens.json",
                   "isInline": false,
                   "line": 6,
@@ -3752,6 +4302,7 @@ Object {
               "type": "Block",
             },
             "buffer": false,
+            "column": 3,
             "filename": "code.iteration.tokens.json",
             "isInline": false,
             "line": 5,
@@ -3761,6 +4312,7 @@ Object {
           },
           Object {
             "buffer": false,
+            "column": 3,
             "filename": "code.iteration.tokens.json",
             "isInline": false,
             "line": 7,
@@ -3771,6 +4323,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 4,
@@ -3780,6 +4333,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 9,
@@ -3803,6 +4357,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 8,
+                      "filename": "code.iteration.tokens.json",
+                      "line": 13,
                       "mustEscape": true,
                       "name": "class",
                       "val": "\'item-\' + i",
@@ -3814,6 +4371,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 26,
                         "filename": "code.iteration.tokens.json",
                         "isInline": true,
                         "line": 13,
@@ -3824,6 +4382,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "code.iteration.tokens.json",
                   "isInline": false,
                   "line": 13,
@@ -3834,6 +4393,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.iteration.tokens.json",
             "key": "i",
             "line": 12,
@@ -3844,6 +4404,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 11,
@@ -3872,6 +4433,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "code.iteration.tokens.json",
                         "isInline": true,
                         "line": 17,
@@ -3882,6 +4444,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "code.iteration.tokens.json",
                   "isInline": false,
                   "line": 17,
@@ -3892,6 +4455,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.iteration.tokens.json",
             "key": "i",
             "line": 16,
@@ -3902,6 +4466,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 15,
@@ -3930,6 +4495,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "code.iteration.tokens.json",
                         "isInline": true,
                         "line": 21,
@@ -3940,6 +4506,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "code.iteration.tokens.json",
                   "isInline": false,
                   "line": 21,
@@ -3950,6 +4517,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.iteration.tokens.json",
             "key": null,
             "line": 20,
@@ -3960,6 +4528,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 19,
@@ -3969,6 +4538,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 23,
@@ -3978,6 +4548,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 24,
@@ -4011,6 +4582,7 @@ Object {
                           "nodes": Array [
                             Object {
                               "buffer": true,
+                              "column": 10,
                               "filename": "code.iteration.tokens.json",
                               "isInline": true,
                               "line": 29,
@@ -4019,6 +4591,7 @@ Object {
                               "val": "n",
                             },
                             Object {
+                              "column": 14,
                               "filename": "code.iteration.tokens.json",
                               "line": 29,
                               "type": "Text",
@@ -4026,6 +4599,7 @@ Object {
                             },
                             Object {
                               "buffer": true,
+                              "column": 16,
                               "filename": "code.iteration.tokens.json",
                               "isInline": true,
                               "line": 29,
@@ -4036,6 +4610,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "code.iteration.tokens.json",
                         "isInline": false,
                         "line": 29,
@@ -4046,6 +4621,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "code.iteration.tokens.json",
                   "key": null,
                   "line": 28,
@@ -4056,6 +4632,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.iteration.tokens.json",
             "key": null,
             "line": 27,
@@ -4066,6 +4643,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 26,
@@ -4075,6 +4653,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 31,
@@ -4084,6 +4663,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 32,
@@ -4112,6 +4692,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 8,
                         "filename": "code.iteration.tokens.json",
                         "isInline": true,
                         "line": 35,
@@ -4122,6 +4703,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "code.iteration.tokens.json",
                   "isInline": false,
                   "line": 35,
@@ -4132,6 +4714,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "code.iteration.tokens.json",
             "key": null,
             "line": 34,
@@ -4142,6 +4725,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.iteration.tokens.json",
       "isInline": false,
       "line": 33,
@@ -4168,6 +4752,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 2,
             "filename": "code.tokens.json",
             "isInline": true,
             "line": 1,
@@ -4178,6 +4763,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 1,
@@ -4194,6 +4780,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 2,
             "filename": "code.tokens.json",
             "isInline": true,
             "line": 2,
@@ -4204,6 +4791,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 2,
@@ -4220,6 +4808,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 2,
             "filename": "code.tokens.json",
             "isInline": true,
             "line": 3,
@@ -4230,6 +4819,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 3,
@@ -4246,6 +4836,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 2,
             "filename": "code.tokens.json",
             "isInline": true,
             "line": 4,
@@ -4256,6 +4847,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 4,
@@ -4272,6 +4864,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 2,
             "filename": "code.tokens.json",
             "isInline": true,
             "line": 5,
@@ -4282,6 +4875,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 5,
@@ -4293,6 +4887,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "code.tokens.json",
+          "line": 6,
           "mustEscape": true,
           "name": "foo",
           "val": "null",
@@ -4304,6 +4901,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 6,
@@ -4315,6 +4913,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "code.tokens.json",
+          "line": 7,
           "mustEscape": true,
           "name": "foo",
           "val": "undefined",
@@ -4326,6 +4927,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 7,
@@ -4337,6 +4939,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "code.tokens.json",
+          "line": 8,
           "mustEscape": true,
           "name": "foo",
           "val": "\'\'",
@@ -4348,6 +4953,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 8,
@@ -4359,6 +4965,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "code.tokens.json",
+          "line": 9,
           "mustEscape": true,
           "name": "foo",
           "val": "0",
@@ -4370,6 +4979,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 9,
@@ -4381,6 +4991,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "code.tokens.json",
+          "line": 10,
           "mustEscape": true,
           "name": "foo",
           "val": "false",
@@ -4392,6 +5005,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "code.tokens.json",
       "isInline": false,
       "line": 10,
@@ -4415,17 +5029,23 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "comments.source.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "s/s.",
           },
           Object {
+            "column": 1,
+            "filename": "comments.source.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.source.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "",
@@ -4434,6 +5054,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "filename": "comments.source.tokens.json",
       "line": 1,
       "type": "BlockComment",
@@ -4441,6 +5062,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "comments.source.tokens.json",
       "line": 4,
       "type": "Comment",
@@ -4452,28 +5074,38 @@ Object {
         "line": 6,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "comments.source.tokens.json",
             "line": 7,
             "type": "Text",
             "val": "test/cases/comments.source.pug",
           },
           Object {
+            "column": 1,
+            "filename": "comments.source.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.source.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "when",
           },
           Object {
+            "column": 1,
+            "filename": "comments.source.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.source.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "()",
@@ -4482,6 +5114,7 @@ Object {
         "type": "Block",
       },
       "buffer": false,
+      "column": 1,
       "filename": "comments.source.tokens.json",
       "line": 6,
       "type": "BlockComment",
@@ -4499,6 +5132,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": true,
+      "column": 1,
       "filename": "comments.tokens.json",
       "line": 2,
       "type": "Comment",
@@ -4513,6 +5147,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 3,
             "filename": "comments.tokens.json",
             "line": 4,
             "type": "Comment",
@@ -4526,6 +5161,7 @@ Object {
               "line": 5,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "comments.tokens.json",
                   "line": 5,
                   "type": "Text",
@@ -4534,6 +5170,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "comments.tokens.json",
             "isInline": false,
             "line": 5,
@@ -4543,6 +5180,7 @@ Object {
           },
           Object {
             "buffer": true,
+            "column": 3,
             "filename": "comments.tokens.json",
             "line": 6,
             "type": "Comment",
@@ -4556,6 +5194,7 @@ Object {
               "line": 7,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "comments.tokens.json",
                   "line": 7,
                   "type": "Text",
@@ -4564,6 +5203,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "comments.tokens.json",
             "isInline": false,
             "line": 7,
@@ -4574,6 +5214,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "comments.tokens.json",
       "isInline": false,
       "line": 3,
@@ -4587,28 +5228,38 @@ Object {
         "line": 9,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 10,
             "type": "Text",
             "val": "ul",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 11,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 11,
             "type": "Text",
             "val": "  li foo",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 12,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 12,
             "type": "Text",
             "val": "",
@@ -4617,6 +5268,7 @@ Object {
         "type": "Block",
       },
       "buffer": true,
+      "column": 1,
       "filename": "comments.tokens.json",
       "line": 9,
       "type": "BlockComment",
@@ -4628,28 +5280,38 @@ Object {
         "line": 13,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 14,
             "type": "Text",
             "val": "// inline follow",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 15,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 15,
             "type": "Text",
             "val": "li three",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 16,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 16,
             "type": "Text",
             "val": "",
@@ -4658,6 +5320,7 @@ Object {
         "type": "Block",
       },
       "buffer": true,
+      "column": 1,
       "filename": "comments.tokens.json",
       "line": 13,
       "type": "BlockComment",
@@ -4669,39 +5332,53 @@ Object {
         "line": 17,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 18,
             "type": "Text",
             "val": "// inline followed by tags",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 19,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 19,
             "type": "Text",
             "val": "ul",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 20,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 20,
             "type": "Text",
             "val": "  li four",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 21,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 21,
             "type": "Text",
             "val": "",
@@ -4710,6 +5387,7 @@ Object {
         "type": "Block",
       },
       "buffer": true,
+      "column": 1,
       "filename": "comments.tokens.json",
       "line": 17,
       "type": "BlockComment",
@@ -4721,39 +5399,53 @@ Object {
         "line": 22,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 23,
             "type": "Text",
             "val": "// inline",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 24,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 24,
             "type": "Text",
             "val": "script(src=\'/lame.js\')",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 25,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 25,
             "type": "Text",
             "val": "// end-inline",
           },
           Object {
+            "column": 1,
+            "filename": "comments.tokens.json",
             "line": 26,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "comments.tokens.json",
             "line": 26,
             "type": "Text",
             "val": "",
@@ -4762,6 +5454,7 @@ Object {
         "type": "Block",
       },
       "buffer": true,
+      "column": 1,
       "filename": "comments.tokens.json",
       "line": 22,
       "type": "BlockComment",
@@ -4775,6 +5468,7 @@ Object {
         "line": 27,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "comments.tokens.json",
             "line": 27,
             "type": "Text",
@@ -4783,6 +5477,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "comments.tokens.json",
       "isInline": false,
       "line": 27,
@@ -4794,6 +5489,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 1,
+          "filename": "comments.tokens.json",
+          "line": 29,
           "mustEscape": false,
           "name": "class",
           "val": "\'foo\'",
@@ -4804,6 +5502,7 @@ Object {
         "line": 29,
         "nodes": Array [
           Object {
+            "column": 6,
             "filename": "comments.tokens.json",
             "line": 29,
             "type": "Text",
@@ -4812,6 +5511,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "comments.tokens.json",
       "isInline": false,
       "line": 29,
@@ -4830,6 +5530,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "comments-in-case.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -4851,6 +5552,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": false,
+                  "column": 4,
                   "filename": "comments-in-case.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -4876,6 +5578,7 @@ Object {
                                 "line": 8,
                                 "nodes": Array [
                                   Object {
+                                    "column": 10,
                                     "filename": "comments-in-case.tokens.json",
                                     "line": 8,
                                     "type": "Text",
@@ -4884,6 +5587,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 8,
                               "filename": "comments-in-case.tokens.json",
                               "isInline": false,
                               "line": 8,
@@ -4894,6 +5598,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 6,
                         "debug": false,
                         "expr": "\'this\'",
                         "filename": "comments-in-case.tokens.json",
@@ -4913,6 +5618,7 @@ Object {
                                 "line": 10,
                                 "nodes": Array [
                                   Object {
+                                    "column": 10,
                                     "filename": "comments-in-case.tokens.json",
                                     "line": 10,
                                     "type": "Text",
@@ -4921,6 +5627,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 8,
                               "filename": "comments-in-case.tokens.json",
                               "isInline": false,
                               "line": 10,
@@ -4931,6 +5638,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 6,
                         "debug": false,
                         "expr": "\'that\'",
                         "filename": "comments-in-case.tokens.json",
@@ -4940,6 +5648,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 4,
                   "expr": "s",
                   "filename": "comments-in-case.tokens.json",
                   "line": 5,
@@ -4948,6 +5657,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "comments-in-case.tokens.json",
             "isInline": false,
             "line": 3,
@@ -4958,6 +5668,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "comments-in-case.tokens.json",
       "isInline": false,
       "line": 2,
@@ -4976,6 +5687,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "doctype.custom.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -4992,6 +5704,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "doctype.default.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -5019,6 +5732,7 @@ Object {
                     "line": 4,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "doctype.default.tokens.json",
                         "line": 4,
                         "type": "Text",
@@ -5027,6 +5741,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "doctype.default.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -5037,6 +5752,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "doctype.default.tokens.json",
             "isInline": false,
             "line": 3,
@@ -5047,6 +5763,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "doctype.default.tokens.json",
       "isInline": false,
       "line": 2,
@@ -5065,6 +5782,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "doctype.keyword.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -5082,6 +5800,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 2,
@@ -5109,6 +5828,7 @@ Object {
                     "line": 8,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "each.else.tokens.json",
                         "line": 8,
                         "type": "Text",
@@ -5117,6 +5837,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 8,
@@ -5140,6 +5861,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "each.else.tokens.json",
                         "isInline": true,
                         "line": 6,
@@ -5150,6 +5872,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 6,
@@ -5160,6 +5883,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "each.else.tokens.json",
             "key": null,
             "line": 5,
@@ -5170,6 +5894,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 4,
@@ -5179,6 +5904,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 11,
@@ -5188,6 +5914,7 @@ Object {
     },
     Object {
       "alternate": null,
+      "column": 1,
       "consequent": Object {
         "filename": "each.else.tokens.json",
         "line": 14,
@@ -5212,6 +5939,7 @@ Object {
                           "line": 18,
                           "nodes": Array [
                             Object {
+                              "column": 10,
                               "filename": "each.else.tokens.json",
                               "line": 18,
                               "type": "Text",
@@ -5220,6 +5948,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "each.else.tokens.json",
                         "isInline": false,
                         "line": 18,
@@ -5243,6 +5972,7 @@ Object {
                           "nodes": Array [
                             Object {
                               "buffer": true,
+                              "column": 9,
                               "filename": "each.else.tokens.json",
                               "isInline": true,
                               "line": 16,
@@ -5253,6 +5983,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "each.else.tokens.json",
                         "isInline": false,
                         "line": 16,
@@ -5263,6 +5994,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "key": null,
                   "line": 15,
@@ -5273,6 +6005,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "each.else.tokens.json",
             "isInline": false,
             "line": 14,
@@ -5290,6 +6023,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 20,
@@ -5317,6 +6051,7 @@ Object {
                     "line": 26,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "each.else.tokens.json",
                         "line": 26,
                         "type": "Text",
@@ -5325,6 +6060,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 26,
@@ -5348,6 +6084,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 8,
                         "filename": "each.else.tokens.json",
                         "isInline": true,
                         "line": 24,
@@ -5356,6 +6093,7 @@ Object {
                         "val": "key",
                       },
                       Object {
+                        "column": 14,
                         "filename": "each.else.tokens.json",
                         "line": 24,
                         "type": "Text",
@@ -5363,6 +6101,7 @@ Object {
                       },
                       Object {
                         "buffer": true,
+                        "column": 16,
                         "filename": "each.else.tokens.json",
                         "isInline": true,
                         "line": 24,
@@ -5373,6 +6112,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 24,
@@ -5383,6 +6123,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "each.else.tokens.json",
             "key": "key",
             "line": 23,
@@ -5393,6 +6134,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 22,
@@ -5402,6 +6144,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 28,
@@ -5429,6 +6172,7 @@ Object {
                     "line": 34,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "each.else.tokens.json",
                         "line": 34,
                         "type": "Text",
@@ -5437,6 +6181,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 34,
@@ -5460,6 +6205,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 8,
                         "filename": "each.else.tokens.json",
                         "isInline": true,
                         "line": 32,
@@ -5468,6 +6214,7 @@ Object {
                         "val": "key",
                       },
                       Object {
+                        "column": 14,
                         "filename": "each.else.tokens.json",
                         "line": 32,
                         "type": "Text",
@@ -5475,6 +6222,7 @@ Object {
                       },
                       Object {
                         "buffer": true,
+                        "column": 16,
                         "filename": "each.else.tokens.json",
                         "isInline": true,
                         "line": 32,
@@ -5485,6 +6233,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 32,
@@ -5495,6 +6244,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "each.else.tokens.json",
             "key": "key",
             "line": 31,
@@ -5505,6 +6255,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 30,
@@ -5514,6 +6265,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 36,
@@ -5523,6 +6275,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 37,
@@ -5550,6 +6303,7 @@ Object {
                     "line": 43,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "each.else.tokens.json",
                         "line": 43,
                         "type": "Text",
@@ -5558,6 +6312,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 43,
@@ -5581,6 +6336,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 8,
                         "filename": "each.else.tokens.json",
                         "isInline": true,
                         "line": 41,
@@ -5589,6 +6345,7 @@ Object {
                         "val": "key",
                       },
                       Object {
+                        "column": 14,
                         "filename": "each.else.tokens.json",
                         "line": 41,
                         "type": "Text",
@@ -5596,6 +6353,7 @@ Object {
                       },
                       Object {
                         "buffer": true,
+                        "column": 16,
                         "filename": "each.else.tokens.json",
                         "isInline": true,
                         "line": 41,
@@ -5606,6 +6364,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "each.else.tokens.json",
                   "isInline": false,
                   "line": 41,
@@ -5616,6 +6375,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "each.else.tokens.json",
             "key": "key",
             "line": 40,
@@ -5626,6 +6386,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "each.else.tokens.json",
       "isInline": false,
       "line": 39,
@@ -5651,6 +6412,8 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "escape-chars.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "var re = /\\d+/;",
@@ -5658,6 +6421,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escape-chars.tokens.json",
       "isInline": false,
       "line": 1,
@@ -5677,6 +6441,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "escape-test.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -5704,6 +6469,7 @@ Object {
                     "line": 4,
                     "nodes": Array [
                       Object {
+                        "column": 15,
                         "filename": "escape-test.tokens.json",
                         "line": 4,
                         "type": "Text",
@@ -5712,6 +6478,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "escape-test.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -5722,6 +6489,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 5,
             "filename": "escape-test.tokens.json",
             "isInline": false,
             "line": 3,
@@ -5745,6 +6513,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": false,
+                        "column": 13,
                         "filename": "escape-test.tokens.json",
                         "isInline": false,
                         "line": 7,
@@ -5754,6 +6523,7 @@ Object {
                       },
                       Object {
                         "buffer": true,
+                        "column": 15,
                         "filename": "escape-test.tokens.json",
                         "isInline": true,
                         "line": 8,
@@ -5764,6 +6534,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "escape-test.tokens.json",
                   "isInline": false,
                   "line": 6,
@@ -5774,6 +6545,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 5,
             "filename": "escape-test.tokens.json",
             "isInline": false,
             "line": 5,
@@ -5784,6 +6556,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escape-test.tokens.json",
       "isInline": false,
       "line": 2,
@@ -5805,6 +6578,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "escaping-class-attribute.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "attr",
           "val": "\"<%= bar %>\"",
@@ -5816,6 +6592,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escaping-class-attribute.tokens.json",
       "isInline": false,
       "line": 1,
@@ -5827,6 +6604,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "escaping-class-attribute.tokens.json",
+          "line": 2,
           "mustEscape": true,
           "name": "class",
           "val": "\"<%= bar %>\"",
@@ -5838,6 +6618,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escaping-class-attribute.tokens.json",
       "isInline": false,
       "line": 2,
@@ -5849,6 +6630,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "escaping-class-attribute.tokens.json",
+          "line": 3,
           "mustEscape": false,
           "name": "attr",
           "val": "\"<%= bar %>\"",
@@ -5860,6 +6644,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escaping-class-attribute.tokens.json",
       "isInline": false,
       "line": 3,
@@ -5871,6 +6656,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "escaping-class-attribute.tokens.json",
+          "line": 4,
           "mustEscape": false,
           "name": "class",
           "val": "\"<%= bar %>\"",
@@ -5882,6 +6670,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escaping-class-attribute.tokens.json",
       "isInline": false,
       "line": 4,
@@ -5893,6 +6682,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "escaping-class-attribute.tokens.json",
+          "line": 5,
           "mustEscape": false,
           "name": "class",
           "val": "\"<%= bar %> lol rofl\"",
@@ -5904,6 +6696,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escaping-class-attribute.tokens.json",
       "isInline": false,
       "line": 5,
@@ -5915,6 +6708,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "escaping-class-attribute.tokens.json",
+          "line": 6,
           "mustEscape": false,
           "name": "class",
           "val": "\"<%= bar %> lol rofl <%= lmao %>\"",
@@ -5926,6 +6722,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "escaping-class-attribute.tokens.json",
       "isInline": false,
       "line": 6,
@@ -5950,7 +6747,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "filter-in-include.tokens.json",
         "line": 1,
         "path": "./auxiliary/filter-in-include.pug",
@@ -5974,6 +6773,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 8,
+          "filename": "filters.coffeescript.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "type",
           "val": "\'text/javascript\'",
@@ -5990,6 +6792,8 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 5,
+                  "filename": "filters.coffeescript.tokens.json",
                   "line": 3,
                   "type": "Text",
                   "val": "regexp = /\\n/",
@@ -5997,6 +6801,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.coffeescript.tokens.json",
             "line": 2,
             "name": "coffee-script",
@@ -6005,6 +6810,9 @@ Object {
           Object {
             "attrs": Array [
               Object {
+                "column": 18,
+                "filename": "filters.coffeescript.tokens.json",
+                "line": 4,
                 "mustEscape": true,
                 "name": "minify",
                 "val": "true",
@@ -6015,17 +6823,23 @@ Object {
               "line": 4,
               "nodes": Array [
                 Object {
+                  "column": 5,
+                  "filename": "filters.coffeescript.tokens.json",
                   "line": 5,
                   "type": "Text",
                   "val": "math =",
                 },
                 Object {
+                  "column": 1,
+                  "filename": "filters.coffeescript.tokens.json",
                   "line": 6,
                   "type": "Text",
                   "val": "
 ",
                 },
                 Object {
+                  "column": 5,
+                  "filename": "filters.coffeescript.tokens.json",
                   "line": 6,
                   "type": "Text",
                   "val": "  square: (value) -> value * value",
@@ -6033,6 +6847,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.coffeescript.tokens.json",
             "line": 4,
             "name": "coffee-script",
@@ -6041,6 +6856,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.coffeescript.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6075,11 +6891,17 @@ Object {
                 Object {
                   "attrs": Array [
                     Object {
+                      "column": 13,
+                      "filename": "filters.custom.tokens.json",
+                      "line": 3,
                       "mustEscape": true,
                       "name": "opt",
                       "val": "\'val\'",
                     },
                     Object {
+                      "column": 23,
+                      "filename": "filters.custom.tokens.json",
+                      "line": 3,
                       "mustEscape": true,
                       "name": "num",
                       "val": "2",
@@ -6090,39 +6912,53 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 7,
+                        "filename": "filters.custom.tokens.json",
                         "line": 4,
                         "type": "Text",
                         "val": "Line 1",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "filters.custom.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "filters.custom.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "Line 2",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "filters.custom.tokens.json",
                         "line": 6,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "filters.custom.tokens.json",
                         "line": 6,
                         "type": "Text",
                         "val": "",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "filters.custom.tokens.json",
                         "line": 7,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "filters.custom.tokens.json",
                         "line": 7,
                         "type": "Text",
                         "val": "Line 4",
@@ -6130,6 +6966,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters.custom.tokens.json",
                   "line": 3,
                   "name": "custom",
@@ -6138,6 +6975,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.custom.tokens.json",
             "isInline": false,
             "line": 2,
@@ -6148,6 +6986,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.custom.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6187,7 +7026,9 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "file": Object {
+                          "column": 39,
                           "filename": "filters.include.custom.tokens.json",
                           "line": 4,
                           "path": "filters.include.custom.pug",
@@ -6198,16 +7039,23 @@ Object {
                           Object {
                             "attrs": Array [
                               Object {
+                                "column": 22,
+                                "filename": "filters.include.custom.tokens.json",
+                                "line": 4,
                                 "mustEscape": true,
                                 "name": "opt",
                                 "val": "\'val\'",
                               },
                               Object {
+                                "column": 32,
+                                "filename": "filters.include.custom.tokens.json",
+                                "line": 4,
                                 "mustEscape": true,
                                 "name": "num",
                                 "val": "2",
                               },
                             ],
+                            "column": 14,
                             "filename": "filters.include.custom.tokens.json",
                             "line": 4,
                             "name": "custom",
@@ -6220,6 +7068,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters.include.custom.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -6230,6 +7079,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.include.custom.tokens.json",
             "isInline": false,
             "line": 2,
@@ -6240,6 +7090,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.include.custom.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6272,7 +7123,9 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "file": Object {
+                    "column": 25,
                     "filename": "filters.include.tokens.json",
                     "line": 3,
                     "path": "some.md",
@@ -6282,6 +7135,7 @@ Object {
                   "filters": Array [
                     Object {
                       "attrs": Array [],
+                      "column": 12,
                       "filename": "filters.include.tokens.json",
                       "line": 3,
                       "name": "markdown-it",
@@ -6299,7 +7153,9 @@ Object {
                     "line": 4,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "file": Object {
+                          "column": 42,
                           "filename": "filters.include.tokens.json",
                           "line": 5,
                           "path": "include-filter-coffee.coffee",
@@ -6310,11 +7166,15 @@ Object {
                           Object {
                             "attrs": Array [
                               Object {
+                                "column": 29,
+                                "filename": "filters.include.tokens.json",
+                                "line": 5,
                                 "mustEscape": true,
                                 "name": "minify",
                                 "val": "true",
                               },
                             ],
+                            "column": 14,
                             "filename": "filters.include.tokens.json",
                             "line": 5,
                             "name": "coffee-script",
@@ -6327,6 +7187,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters.include.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -6342,7 +7203,9 @@ Object {
                     "line": 6,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "file": Object {
+                          "column": 43,
                           "filename": "filters.include.tokens.json",
                           "line": 7,
                           "path": "include-filter-coffee.coffee",
@@ -6353,11 +7216,15 @@ Object {
                           Object {
                             "attrs": Array [
                               Object {
+                                "column": 29,
+                                "filename": "filters.include.tokens.json",
+                                "line": 7,
                                 "mustEscape": true,
                                 "name": "minify",
                                 "val": "false",
                               },
                             ],
+                            "column": 14,
                             "filename": "filters.include.tokens.json",
                             "line": 7,
                             "name": "coffee-script",
@@ -6370,6 +7237,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters.include.tokens.json",
                   "isInline": false,
                   "line": 6,
@@ -6380,6 +7248,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.include.tokens.json",
             "isInline": false,
             "line": 2,
@@ -6390,6 +7259,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.include.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6415,6 +7285,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "filters.inline.tokens.json",
             "line": 1,
             "type": "Text",
@@ -6427,6 +7298,7 @@ Object {
               "line": 1,
               "nodes": Array [
                 Object {
+                  "column": 19,
                   "filename": "filters.inline.tokens.json",
                   "line": 1,
                   "type": "Text",
@@ -6435,12 +7307,14 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 12,
             "filename": "filters.inline.tokens.json",
             "line": 1,
             "name": "cdata",
             "type": "Filter",
           },
           Object {
+            "column": 26,
             "filename": "filters.inline.tokens.json",
             "line": 1,
             "type": "Text",
@@ -6449,6 +7323,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.inline.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6484,6 +7359,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 11,
+                      "filename": "filters.less.tokens.json",
+                      "line": 3,
                       "mustEscape": true,
                       "name": "type",
                       "val": "\"text/css\"",
@@ -6500,39 +7378,53 @@ Object {
                           "line": 4,
                           "nodes": Array [
                             Object {
+                              "column": 9,
+                              "filename": "filters.less.tokens.json",
                               "line": 5,
                               "type": "Text",
                               "val": "@pad: 15px;",
                             },
                             Object {
+                              "column": 1,
+                              "filename": "filters.less.tokens.json",
                               "line": 6,
                               "type": "Text",
                               "val": "
 ",
                             },
                             Object {
+                              "column": 9,
+                              "filename": "filters.less.tokens.json",
                               "line": 6,
                               "type": "Text",
                               "val": "body {",
                             },
                             Object {
+                              "column": 1,
+                              "filename": "filters.less.tokens.json",
                               "line": 7,
                               "type": "Text",
                               "val": "
 ",
                             },
                             Object {
+                              "column": 9,
+                              "filename": "filters.less.tokens.json",
                               "line": 7,
                               "type": "Text",
                               "val": "  padding: @pad;",
                             },
                             Object {
+                              "column": 1,
+                              "filename": "filters.less.tokens.json",
                               "line": 8,
                               "type": "Text",
                               "val": "
 ",
                             },
                             Object {
+                              "column": 9,
+                              "filename": "filters.less.tokens.json",
                               "line": 8,
                               "type": "Text",
                               "val": "}",
@@ -6540,6 +7432,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "filters.less.tokens.json",
                         "line": 4,
                         "name": "less",
@@ -6548,6 +7441,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters.less.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -6558,6 +7452,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.less.tokens.json",
             "isInline": false,
             "line": 2,
@@ -6568,6 +7463,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.less.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6606,17 +7502,23 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 7,
+                        "filename": "filters.markdown.tokens.json",
                         "line": 4,
                         "type": "Text",
                         "val": "This is _some_ awesome **markdown**",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "filters.markdown.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "filters.markdown.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "whoop.",
@@ -6624,6 +7526,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters.markdown.tokens.json",
                   "line": 3,
                   "name": "markdown-it",
@@ -6632,6 +7535,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.markdown.tokens.json",
             "isInline": false,
             "line": 2,
@@ -6642,6 +7546,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.markdown.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6679,28 +7584,38 @@ Object {
                     "line": 2,
                     "nodes": Array [
                       Object {
+                        "column": 5,
+                        "filename": "filters.nested.tokens.json",
                         "line": 3,
                         "type": "Text",
                         "val": "(function() {",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "filters.nested.tokens.json",
                         "line": 4,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "filters.nested.tokens.json",
                         "line": 4,
                         "type": "Text",
                         "val": "  console.log(\'test\')",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "filters.nested.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 5,
+                        "filename": "filters.nested.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "})()",
@@ -6708,6 +7623,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "filters.nested.tokens.json",
                   "line": 2,
                   "name": "uglify-js",
@@ -6716,6 +7632,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.nested.tokens.json",
             "line": 2,
             "name": "cdata",
@@ -6724,6 +7641,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.nested.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6757,28 +7675,38 @@ Object {
                           "line": 7,
                           "nodes": Array [
                             Object {
+                              "column": 5,
+                              "filename": "filters.nested.tokens.json",
                               "line": 8,
                               "type": "Text",
                               "val": "(->",
                             },
                             Object {
+                              "column": 1,
+                              "filename": "filters.nested.tokens.json",
                               "line": 9,
                               "type": "Text",
                               "val": "
 ",
                             },
                             Object {
+                              "column": 5,
+                              "filename": "filters.nested.tokens.json",
                               "line": 9,
                               "type": "Text",
                               "val": "  console.log \'test\'",
                             },
                             Object {
+                              "column": 1,
+                              "filename": "filters.nested.tokens.json",
                               "line": 10,
                               "type": "Text",
                               "val": "
 ",
                             },
                             Object {
+                              "column": 5,
+                              "filename": "filters.nested.tokens.json",
                               "line": 10,
                               "type": "Text",
                               "val": ")()",
@@ -6786,6 +7714,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 19,
                         "filename": "filters.nested.tokens.json",
                         "line": 7,
                         "name": "coffee-script",
@@ -6794,6 +7723,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 9,
                   "filename": "filters.nested.tokens.json",
                   "line": 7,
                   "name": "uglify-js",
@@ -6802,6 +7732,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.nested.tokens.json",
             "line": 7,
             "name": "cdata",
@@ -6810,6 +7741,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.nested.tokens.json",
       "isInline": false,
       "line": 6,
@@ -6845,6 +7777,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 11,
+                      "filename": "filters.stylus.tokens.json",
+                      "line": 3,
                       "mustEscape": true,
                       "name": "type",
                       "val": "\"text/css\"",
@@ -6861,17 +7796,23 @@ Object {
                           "line": 4,
                           "nodes": Array [
                             Object {
+                              "column": 9,
+                              "filename": "filters.stylus.tokens.json",
                               "line": 5,
                               "type": "Text",
                               "val": "body",
                             },
                             Object {
+                              "column": 1,
+                              "filename": "filters.stylus.tokens.json",
                               "line": 6,
                               "type": "Text",
                               "val": "
 ",
                             },
                             Object {
+                              "column": 9,
+                              "filename": "filters.stylus.tokens.json",
                               "line": 6,
                               "type": "Text",
                               "val": "  padding: 50px",
@@ -6879,6 +7820,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "filters.stylus.tokens.json",
                         "line": 4,
                         "name": "stylus",
@@ -6887,6 +7829,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters.stylus.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -6897,6 +7840,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.stylus.tokens.json",
             "isInline": false,
             "line": 2,
@@ -6913,6 +7857,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters.stylus.tokens.json",
             "isInline": false,
             "line": 7,
@@ -6923,6 +7868,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters.stylus.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6942,6 +7888,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "filters-empty.tokens.json",
       "isInline": false,
       "line": 1,
@@ -6965,6 +7912,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 13,
+                      "filename": "filters-empty.tokens.json",
+                      "line": 5,
                       "mustEscape": true,
                       "name": "age",
                       "val": "user.age",
@@ -6982,6 +7932,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "filters-empty.tokens.json",
                         "line": 6,
                         "name": "cdata",
@@ -6990,6 +7941,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "filters-empty.tokens.json",
                   "isInline": false,
                   "line": 5,
@@ -7000,6 +7952,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "filters-empty.tokens.json",
             "key": null,
             "line": 4,
@@ -7010,6 +7963,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "filters-empty.tokens.json",
       "isInline": false,
       "line": 3,
@@ -7029,6 +7983,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "html.tokens.json",
       "isInline": false,
       "line": 1,
@@ -7037,6 +7992,7 @@ Object {
       "val": "var version = 1449104952939",
     },
     Object {
+      "column": 1,
       "filename": "html.tokens.json",
       "isHtml": true,
       "line": 3,
@@ -7050,6 +8006,7 @@ Object {
     },
     Object {
       "buffer": true,
+      "column": 31,
       "filename": "html.tokens.json",
       "isInline": true,
       "line": 9,
@@ -7058,6 +8015,7 @@ Object {
       "val": "version",
     },
     Object {
+      "column": 41,
       "filename": "html.tokens.json",
       "isHtml": true,
       "line": 9,
@@ -7073,6 +8031,7 @@ Object {
         "line": 12,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "html.tokens.json",
             "line": 12,
             "type": "Text",
@@ -7081,6 +8040,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "html.tokens.json",
       "isInline": false,
       "line": 12,
@@ -7096,6 +8056,7 @@ Object {
         "line": 13,
         "nodes": Array [
           Object {
+            "column": 4,
             "filename": "html.tokens.json",
             "isHtml": true,
             "line": 13,
@@ -7105,6 +8066,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "html.tokens.json",
       "isInline": false,
       "line": 13,
@@ -7123,6 +8085,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "html5.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -7132,11 +8095,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "html5.tokens.json",
+          "line": 2,
           "mustEscape": true,
           "name": "type",
           "val": "\'checkbox\'",
         },
         Object {
+          "column": 24,
+          "filename": "html5.tokens.json",
+          "line": 2,
           "mustEscape": false,
           "name": "checked",
           "val": true,
@@ -7148,6 +8117,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "html5.tokens.json",
       "isInline": false,
       "line": 2,
@@ -7159,11 +8129,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "html5.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "type",
           "val": "\'checkbox\'",
         },
         Object {
+          "column": 24,
+          "filename": "html5.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "checked",
           "val": "true",
@@ -7175,6 +8151,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "html5.tokens.json",
       "isInline": false,
       "line": 3,
@@ -7186,11 +8163,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "html5.tokens.json",
+          "line": 4,
           "mustEscape": true,
           "name": "type",
           "val": "\'checkbox\'",
         },
         Object {
+          "column": 24,
+          "filename": "html5.tokens.json",
+          "line": 4,
           "mustEscape": true,
           "name": "checked",
           "val": "false",
@@ -7202,6 +8185,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "html5.tokens.json",
       "isInline": false,
       "line": 4,
@@ -7223,11 +8207,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "include.script.tokens.json",
+          "line": 1,
           "mustEscape": false,
           "name": "id",
           "val": "\'pet-template\'",
         },
         Object {
+          "column": 21,
+          "filename": "include.script.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "type",
           "val": "\'text/x-template\'",
@@ -7244,7 +8234,9 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "file": Object {
+              "column": 11,
               "filename": "include.script.tokens.json",
               "line": 2,
               "path": "auxiliary/pet.pug",
@@ -7257,6 +8249,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "include.script.tokens.json",
       "isInline": false,
       "line": 1,
@@ -7287,6 +8280,7 @@ Object {
               "line": 3,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "include.yield.nested.tokens.json",
                   "line": 3,
                   "type": "Text",
@@ -7295,6 +8289,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "include.yield.nested.tokens.json",
             "isInline": false,
             "line": 3,
@@ -7310,6 +8305,7 @@ Object {
               "line": 4,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "include.yield.nested.tokens.json",
                   "line": 4,
                   "type": "Text",
@@ -7318,6 +8314,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "include.yield.nested.tokens.json",
             "isInline": false,
             "line": 4,
@@ -7328,7 +8325,9 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "include.yield.nested.tokens.json",
         "line": 2,
         "path": "auxiliary/yield-nested.pug",
@@ -7355,7 +8354,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "include-extends-from-root.tokens.json",
         "line": 1,
         "path": "/auxiliary/extends-from-root.pug",
@@ -7382,7 +8383,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "include-extends-of-common-template.tokens.json",
         "line": 1,
         "path": "auxiliary/extends-empty-block-1.pug",
@@ -7399,7 +8402,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "include-extends-of-common-template.tokens.json",
         "line": 2,
         "path": "auxiliary/extends-empty-block-2.pug",
@@ -7426,7 +8431,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "include-extends-relative.tokens.json",
         "line": 1,
         "path": "../cases/auxiliary/extends-relative.pug",
@@ -7480,6 +8487,7 @@ Object {
                                 "line": 5,
                                 "nodes": Array [
                                   Object {
+                                    "column": 12,
                                     "filename": "include-only-text.tokens.json",
                                     "line": 5,
                                     "type": "Text",
@@ -7488,6 +8496,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "include-only-text.tokens.json",
                               "isInline": true,
                               "line": 5,
@@ -7498,7 +8507,9 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "file": Object {
+                          "column": 15,
                           "filename": "include-only-text.tokens.json",
                           "line": 4,
                           "path": "include-only-text-body.pug",
@@ -7511,6 +8522,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "include-only-text.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -7521,6 +8533,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "include-only-text.tokens.json",
             "isInline": false,
             "line": 2,
@@ -7531,6 +8544,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "include-only-text.tokens.json",
       "isInline": false,
       "line": 1,
@@ -7549,17 +8563,20 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 3,
       "filename": "include-only-text-body.tokens.json",
       "line": 1,
       "type": "Text",
       "val": "The message is \"",
     },
     Object {
+      "column": 1,
       "filename": "include-only-text-body.tokens.json",
       "line": 2,
       "type": "YieldBlock",
     },
     Object {
+      "column": 3,
       "filename": "include-only-text-body.tokens.json",
       "line": 3,
       "type": "Text",
@@ -7591,6 +8608,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 12,
+                      "filename": "include-with-text.tokens.json",
+                      "line": 3,
                       "mustEscape": true,
                       "name": "src",
                       "val": "\'/caustic.js\'",
@@ -7602,6 +8622,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "include-with-text.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -7613,6 +8634,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 12,
+                      "filename": "include-with-text.tokens.json",
+                      "line": 4,
                       "mustEscape": true,
                       "name": "src",
                       "val": "\'/app.js\'",
@@ -7624,6 +8648,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "include-with-text.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -7634,7 +8659,9 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "file": Object {
+              "column": 11,
               "filename": "include-with-text.tokens.json",
               "line": 2,
               "path": "include-with-text-head.pug",
@@ -7647,6 +8674,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "include-with-text.tokens.json",
       "isInline": false,
       "line": 1,
@@ -7675,6 +8703,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "include-with-text-head.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "type",
                 "val": "\'text/javascript\'",
@@ -7685,6 +8716,8 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 5,
+                  "filename": "include-with-text-head.tokens.json",
                   "line": 3,
                   "type": "Text",
                   "val": "alert(\'hello world\');",
@@ -7692,6 +8725,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "include-with-text-head.tokens.json",
             "isInline": false,
             "line": 2,
@@ -7703,6 +8737,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "include-with-text-head.tokens.json",
       "isInline": false,
       "line": 1,
@@ -7727,7 +8762,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "includes.tokens.json",
         "line": 2,
         "path": "auxiliary/mixins.pug",
@@ -7743,6 +8780,7 @@ Object {
       "attrs": Array [],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "includes.tokens.json",
       "line": 4,
       "name": "foo",
@@ -7756,7 +8794,9 @@ Object {
         "line": 6,
         "nodes": Array [
           Object {
+            "column": 3,
             "file": Object {
+              "column": 11,
               "filename": "includes.tokens.json",
               "line": 7,
               "path": "auxiliary/smile.html",
@@ -7768,7 +8808,9 @@ Object {
             "type": "RawInclude",
           },
           Object {
+            "column": 3,
             "file": Object {
+              "column": 11,
               "filename": "includes.tokens.json",
               "line": 8,
               "path": "auxiliary/escapes.html",
@@ -7783,6 +8825,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "includes.tokens.json",
+                "line": 9,
                 "mustEscape": true,
                 "name": "type",
                 "val": "\"text/javascript\"",
@@ -7793,7 +8838,9 @@ Object {
               "line": 9,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "file": Object {
+                    "column": 22,
                     "filename": "includes.tokens.json",
                     "line": 10,
                     "path": "auxiliary/includable.js",
@@ -7803,6 +8850,7 @@ Object {
                   "filters": Array [
                     Object {
                       "attrs": Array [],
+                      "column": 12,
                       "filename": "includes.tokens.json",
                       "line": 10,
                       "name": "verbatim",
@@ -7815,6 +8863,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "includes.tokens.json",
             "isInline": false,
             "line": 9,
@@ -7825,6 +8874,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "includes.tokens.json",
       "isInline": false,
       "line": 6,
@@ -7857,7 +8907,9 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "file": Object {
+                    "column": 13,
                     "filename": "includes-with-ext-js.tokens.json",
                     "line": 3,
                     "path": "javascript-new-lines.js",
@@ -7871,6 +8923,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "includes-with-ext-js.tokens.json",
             "isInline": true,
             "line": 2,
@@ -7881,6 +8934,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "includes-with-ext-js.tokens.json",
       "isInline": false,
       "line": 1,
@@ -7899,7 +8953,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "inheritance.alert-dialog.tokens.json",
         "line": 2,
         "path": "auxiliary/dialog.pug",
@@ -7910,6 +8966,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.alert-dialog.tokens.json",
       "line": 4,
       "mode": "replace",
@@ -7923,6 +8980,7 @@ Object {
             "line": 5,
             "nodes": Array [
               Object {
+                "column": 6,
                 "filename": "inheritance.alert-dialog.tokens.json",
                 "line": 5,
                 "type": "Text",
@@ -7931,6 +8989,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.alert-dialog.tokens.json",
           "isInline": false,
           "line": 5,
@@ -7946,6 +9005,7 @@ Object {
             "line": 6,
             "nodes": Array [
               Object {
+                "column": 5,
                 "filename": "inheritance.alert-dialog.tokens.json",
                 "line": 6,
                 "type": "Text",
@@ -7954,6 +9014,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.alert-dialog.tokens.json",
           "isInline": false,
           "line": 6,
@@ -7989,6 +9050,7 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "inheritance.defaults.tokens.json",
                   "line": 3,
                   "mode": "replace",
@@ -7998,6 +9060,9 @@ Object {
                       "attributeBlocks": Array [],
                       "attrs": Array [
                         Object {
+                          "column": 14,
+                          "filename": "inheritance.defaults.tokens.json",
+                          "line": 4,
                           "mustEscape": true,
                           "name": "src",
                           "val": "\'jquery.js\'",
@@ -8009,6 +9074,7 @@ Object {
                         "nodes": Array [],
                         "type": "Block",
                       },
+                      "column": 7,
                       "filename": "inheritance.defaults.tokens.json",
                       "isInline": false,
                       "line": 4,
@@ -8020,6 +9086,9 @@ Object {
                       "attributeBlocks": Array [],
                       "attrs": Array [
                         Object {
+                          "column": 14,
+                          "filename": "inheritance.defaults.tokens.json",
+                          "line": 5,
                           "mustEscape": true,
                           "name": "src",
                           "val": "\'keymaster.js\'",
@@ -8031,6 +9100,7 @@ Object {
                         "nodes": Array [],
                         "type": "Block",
                       },
+                      "column": 7,
                       "filename": "inheritance.defaults.tokens.json",
                       "isInline": false,
                       "line": 5,
@@ -8042,6 +9112,9 @@ Object {
                       "attributeBlocks": Array [],
                       "attrs": Array [
                         Object {
+                          "column": 14,
+                          "filename": "inheritance.defaults.tokens.json",
+                          "line": 6,
                           "mustEscape": true,
                           "name": "src",
                           "val": "\'caustic.js\'",
@@ -8053,6 +9126,7 @@ Object {
                         "nodes": Array [],
                         "type": "Block",
                       },
+                      "column": 7,
                       "filename": "inheritance.defaults.tokens.json",
                       "isInline": false,
                       "line": 6,
@@ -8066,6 +9140,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "inheritance.defaults.tokens.json",
             "isInline": false,
             "line": 2,
@@ -8076,6 +9151,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "inheritance.defaults.tokens.json",
       "isInline": false,
       "line": 1,
@@ -8094,7 +9170,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 8,
         "filename": "inheritance.extend.include.tokens.json",
         "line": 2,
         "path": "auxiliary/layout.include.pug",
@@ -8105,6 +9183,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.include.tokens.json",
       "line": 4,
       "mode": "replace",
@@ -8114,6 +9193,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "inheritance.extend.include.tokens.json",
+              "line": 5,
               "mustEscape": true,
               "name": "src",
               "val": "\'jquery.js\'",
@@ -8125,6 +9207,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.include.tokens.json",
           "isInline": false,
           "line": 5,
@@ -8136,6 +9219,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.include.tokens.json",
       "line": 7,
       "mode": "replace",
@@ -8149,6 +9233,7 @@ Object {
             "line": 8,
             "nodes": Array [
               Object {
+                "column": 6,
                 "filename": "inheritance.extend.include.tokens.json",
                 "line": 8,
                 "type": "Text",
@@ -8157,6 +9242,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.include.tokens.json",
           "isInline": false,
           "line": 8,
@@ -8172,6 +9258,7 @@ Object {
             "line": 9,
             "nodes": Array [
               Object {
+                "column": 5,
                 "filename": "inheritance.extend.include.tokens.json",
                 "line": 9,
                 "type": "Text",
@@ -8180,6 +9267,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.include.tokens.json",
           "isInline": false,
           "line": 9,
@@ -8191,6 +9279,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.include.tokens.json",
       "line": 11,
       "mode": "replace",
@@ -8204,6 +9293,7 @@ Object {
             "line": 12,
             "nodes": Array [
               Object {
+                "column": 6,
                 "filename": "inheritance.extend.include.tokens.json",
                 "line": 12,
                 "type": "Text",
@@ -8212,6 +9302,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.include.tokens.json",
           "isInline": false,
           "line": 12,
@@ -8227,6 +9318,7 @@ Object {
             "line": 13,
             "nodes": Array [
               Object {
+                "column": 5,
                 "filename": "inheritance.extend.include.tokens.json",
                 "line": 13,
                 "type": "Text",
@@ -8235,6 +9327,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.include.tokens.json",
           "isInline": false,
           "line": 13,
@@ -8256,7 +9349,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 8,
         "filename": "inheritance.extend.mixins.block.tokens.json",
         "line": 1,
         "path": "auxiliary/inheritance.extend.mixin.block.pug",
@@ -8267,6 +9362,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.mixins.block.tokens.json",
       "line": 3,
       "mode": "replace",
@@ -8280,6 +9376,7 @@ Object {
             "line": 4,
             "nodes": Array [
               Object {
+                "column": 5,
                 "filename": "inheritance.extend.mixins.block.tokens.json",
                 "line": 4,
                 "type": "Text",
@@ -8288,6 +9385,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.mixins.block.tokens.json",
           "isInline": false,
           "line": 4,
@@ -8309,7 +9407,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 8,
         "filename": "inheritance.extend.mixins.tokens.json",
         "line": 2,
         "path": "auxiliary/layout.pug",
@@ -8327,6 +9427,7 @@ Object {
         "nodes": Array [
           Object {
             "alternate": null,
+            "column": 3,
             "consequent": Object {
               "filename": "inheritance.extend.mixins.tokens.json",
               "line": 6,
@@ -8340,6 +9441,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "inheritance.extend.mixins.tokens.json",
                         "isInline": true,
                         "line": 6,
@@ -8350,6 +9452,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "inheritance.extend.mixins.tokens.json",
                   "isInline": false,
                   "line": 6,
@@ -8366,6 +9469,7 @@ Object {
             "type": "Conditional",
           },
           Object {
+            "column": 3,
             "filename": "inheritance.extend.mixins.tokens.json",
             "line": 7,
             "type": "MixinBlock",
@@ -8374,12 +9478,14 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "inheritance.extend.mixins.tokens.json",
       "line": 4,
       "name": "article",
       "type": "Mixin",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.mixins.tokens.json",
       "line": 9,
       "mode": "replace",
@@ -8401,6 +9507,7 @@ Object {
                   "line": 11,
                   "nodes": Array [
                     Object {
+                      "column": 7,
                       "filename": "inheritance.extend.mixins.tokens.json",
                       "line": 11,
                       "type": "Text",
@@ -8409,6 +9516,7 @@ Object {
                   ],
                   "type": "Block",
                 },
+                "column": 5,
                 "filename": "inheritance.extend.mixins.tokens.json",
                 "isInline": false,
                 "line": 11,
@@ -8420,6 +9528,7 @@ Object {
             "type": "Block",
           },
           "call": true,
+          "column": 3,
           "filename": "inheritance.extend.mixins.tokens.json",
           "line": 10,
           "name": "article",
@@ -8439,7 +9548,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "inheritance.extend.recursive.tokens.json",
         "line": 1,
         "path": "/auxiliary/inheritance.extend.recursive-parent.pug",
@@ -8450,6 +9561,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.recursive.tokens.json",
       "line": 3,
       "mode": "replace",
@@ -8463,6 +9575,7 @@ Object {
             "line": 4,
             "nodes": Array [
               Object {
+                "column": 8,
                 "filename": "inheritance.extend.recursive.tokens.json",
                 "line": 4,
                 "type": "Text",
@@ -8471,6 +9584,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 5,
           "filename": "inheritance.extend.recursive.tokens.json",
           "isInline": false,
           "line": 4,
@@ -8492,7 +9606,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 8,
         "filename": "inheritance.extend.tokens.json",
         "line": 2,
         "path": "auxiliary/layout.pug",
@@ -8503,6 +9619,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.tokens.json",
       "line": 4,
       "mode": "replace",
@@ -8512,6 +9629,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "inheritance.extend.tokens.json",
+              "line": 5,
               "mustEscape": true,
               "name": "src",
               "val": "\'jquery.js\'",
@@ -8523,6 +9643,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.tokens.json",
           "isInline": false,
           "line": 5,
@@ -8534,6 +9655,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.tokens.json",
       "line": 7,
       "mode": "replace",
@@ -8547,6 +9669,7 @@ Object {
             "line": 8,
             "nodes": Array [
               Object {
+                "column": 6,
                 "filename": "inheritance.extend.tokens.json",
                 "line": 8,
                 "type": "Text",
@@ -8555,6 +9678,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.tokens.json",
           "isInline": false,
           "line": 8,
@@ -8570,6 +9694,7 @@ Object {
             "line": 9,
             "nodes": Array [
               Object {
+                "column": 5,
                 "filename": "inheritance.extend.tokens.json",
                 "line": 9,
                 "type": "Text",
@@ -8578,6 +9703,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.tokens.json",
           "isInline": false,
           "line": 9,
@@ -8599,7 +9725,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 8,
         "filename": "inheritance.extend.whitespace.tokens.json",
         "line": 2,
         "path": "auxiliary/layout.pug",
@@ -8610,6 +9738,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.whitespace.tokens.json",
       "line": 4,
       "mode": "replace",
@@ -8619,6 +9748,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "inheritance.extend.whitespace.tokens.json",
+              "line": 6,
               "mustEscape": true,
               "name": "src",
               "val": "\'jquery.js\'",
@@ -8630,6 +9762,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.whitespace.tokens.json",
           "isInline": false,
           "line": 6,
@@ -8641,6 +9774,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.extend.whitespace.tokens.json",
       "line": 8,
       "mode": "replace",
@@ -8654,6 +9788,7 @@ Object {
             "line": 12,
             "nodes": Array [
               Object {
+                "column": 6,
                 "filename": "inheritance.extend.whitespace.tokens.json",
                 "line": 12,
                 "type": "Text",
@@ -8662,6 +9797,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.whitespace.tokens.json",
           "isInline": false,
           "line": 12,
@@ -8677,6 +9813,7 @@ Object {
             "line": 13,
             "nodes": Array [
               Object {
+                "column": 5,
                 "filename": "inheritance.extend.whitespace.tokens.json",
                 "line": 13,
                 "type": "Text",
@@ -8685,6 +9822,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.extend.whitespace.tokens.json",
           "isInline": false,
           "line": 13,
@@ -8706,7 +9844,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "inheritance.tokens.json",
         "line": 2,
         "path": "auxiliary/layout.pug",
@@ -8717,6 +9857,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.tokens.json",
       "line": 4,
       "mode": "replace",
@@ -8726,6 +9867,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "inheritance.tokens.json",
+              "line": 5,
               "mustEscape": true,
               "name": "src",
               "val": "\'jquery.js\'",
@@ -8737,6 +9881,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.tokens.json",
           "isInline": false,
           "line": 5,
@@ -8748,6 +9893,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "inheritance.tokens.json",
       "line": 7,
       "mode": "replace",
@@ -8761,6 +9907,7 @@ Object {
             "line": 8,
             "nodes": Array [
               Object {
+                "column": 6,
                 "filename": "inheritance.tokens.json",
                 "line": 8,
                 "type": "Text",
@@ -8769,6 +9916,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.tokens.json",
           "isInline": false,
           "line": 8,
@@ -8784,6 +9932,7 @@ Object {
             "line": 9,
             "nodes": Array [
               Object {
+                "column": 5,
                 "filename": "inheritance.tokens.json",
                 "line": 9,
                 "type": "Text",
@@ -8792,6 +9941,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 3,
           "filename": "inheritance.tokens.json",
           "isInline": false,
           "line": 9,
@@ -8813,6 +9963,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "inline-block-comment.tokens.json",
       "line": 1,
       "mode": "replace",
@@ -8822,12 +9973,14 @@ Object {
     },
     Object {
       "buffer": true,
+      "column": 1,
       "filename": "inline-block-comment.tokens.json",
       "line": 1,
       "type": "Comment",
       "val": " Main content goes here",
     },
     Object {
+      "column": 1,
       "filename": "inline-block-comment.tokens.json",
       "line": 2,
       "mode": "append",
@@ -8837,12 +9990,14 @@ Object {
     },
     Object {
       "buffer": true,
+      "column": 1,
       "filename": "inline-block-comment.tokens.json",
       "line": 2,
       "type": "Comment",
       "val": " adding something to content",
     },
     Object {
+      "column": 1,
       "filename": "inline-block-comment.tokens.json",
       "line": 3,
       "mode": "prepend",
@@ -8852,6 +10007,7 @@ Object {
     },
     Object {
       "buffer": true,
+      "column": 1,
       "filename": "inline-block-comment.tokens.json",
       "line": 3,
       "type": "Comment",
@@ -8875,6 +10031,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "inline-tag.tokens.json",
             "line": 1,
             "type": "Text",
@@ -8888,6 +10045,7 @@ Object {
               "line": 1,
               "nodes": Array [
                 Object {
+                  "column": 17,
                   "filename": "inline-tag.tokens.json",
                   "line": 1,
                   "type": "Text",
@@ -8896,6 +10054,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 10,
             "filename": "inline-tag.tokens.json",
             "isInline": true,
             "line": 1,
@@ -8904,6 +10063,7 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 21,
             "filename": "inline-tag.tokens.json",
             "line": 1,
             "type": "Text",
@@ -8912,6 +10072,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "inline-tag.tokens.json",
       "isInline": false,
       "line": 1,
@@ -8927,17 +10088,23 @@ Object {
         "line": 3,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "bing",
           },
           Object {
+            "column": 1,
+            "filename": "inline-tag.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "",
@@ -8950,6 +10117,7 @@ Object {
               "line": 5,
               "nodes": Array [
                 Object {
+                  "column": 12,
                   "filename": "inline-tag.tokens.json",
                   "line": 5,
                   "type": "Text",
@@ -8958,6 +10126,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "isInline": true,
             "line": 5,
@@ -8966,17 +10135,23 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 16,
+            "filename": "inline-tag.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
+            "filename": "inline-tag.tokens.json",
             "line": 6,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 6,
             "type": "Text",
             "val": "",
@@ -8990,6 +10165,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 11,
                   "filename": "inline-tag.tokens.json",
                   "isInline": true,
                   "line": 6,
@@ -9000,6 +10176,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "isInline": true,
             "line": 6,
@@ -9008,23 +10185,30 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 21,
+            "filename": "inline-tag.tokens.json",
             "line": 6,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
+            "filename": "inline-tag.tokens.json",
             "line": 7,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 7,
             "type": "Text",
             "val": "",
           },
           Object {
             "buffer": false,
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "isInline": false,
             "line": 7,
@@ -9033,28 +10217,38 @@ Object {
             "val": "var foo = \'foo]\'",
           },
           Object {
+            "column": 24,
+            "filename": "inline-tag.tokens.json",
             "line": 7,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
+            "filename": "inline-tag.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "bong",
           },
           Object {
+            "column": 1,
+            "filename": "inline-tag.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "",
@@ -9062,6 +10256,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "inline-tag.tokens.json",
       "isInline": false,
       "line": 3,
@@ -9078,12 +10273,14 @@ Object {
         "line": 10,
         "nodes": Array [
           Object {
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "line": 11,
             "type": "Text",
             "val": "bing",
           },
           Object {
+            "column": 1,
             "filename": "inline-tag.tokens.json",
             "line": 12,
             "type": "Text",
@@ -9091,6 +10288,7 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "line": 12,
             "type": "Text",
@@ -9104,6 +10302,7 @@ Object {
               "line": 12,
               "nodes": Array [
                 Object {
+                  "column": 14,
                   "filename": "inline-tag.tokens.json",
                   "line": 12,
                   "type": "Text",
@@ -9112,6 +10311,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 7,
             "filename": "inline-tag.tokens.json",
             "isInline": true,
             "line": 12,
@@ -9120,12 +10320,14 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 18,
             "filename": "inline-tag.tokens.json",
             "line": 12,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
             "filename": "inline-tag.tokens.json",
             "line": 13,
             "type": "Text",
@@ -9133,6 +10335,7 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "line": 13,
             "type": "Text",
@@ -9147,6 +10350,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 13,
                   "filename": "inline-tag.tokens.json",
                   "isInline": true,
                   "line": 13,
@@ -9157,6 +10361,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 7,
             "filename": "inline-tag.tokens.json",
             "isInline": true,
             "line": 13,
@@ -9165,12 +10370,14 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 23,
             "filename": "inline-tag.tokens.json",
             "line": 13,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
             "filename": "inline-tag.tokens.json",
             "line": 14,
             "type": "Text",
@@ -9178,6 +10385,7 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "line": 14,
             "type": "Text",
@@ -9185,6 +10393,7 @@ Object {
           },
           Object {
             "buffer": false,
+            "column": 7,
             "filename": "inline-tag.tokens.json",
             "isInline": false,
             "line": 14,
@@ -9193,12 +10402,14 @@ Object {
             "val": "var foo = \'foo]\'",
           },
           Object {
+            "column": 26,
             "filename": "inline-tag.tokens.json",
             "line": 14,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
             "filename": "inline-tag.tokens.json",
             "line": 15,
             "type": "Text",
@@ -9206,6 +10417,7 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "inline-tag.tokens.json",
             "line": 15,
             "type": "Text",
@@ -9214,6 +10426,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "inline-tag.tokens.json",
       "isInline": false,
       "line": 10,
@@ -9229,17 +10442,23 @@ Object {
         "line": 17,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 18,
             "type": "Text",
             "val": "#[strong escaped]",
           },
           Object {
+            "column": 1,
+            "filename": "inline-tag.tokens.json",
             "line": 19,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "inline-tag.tokens.json",
             "line": 19,
             "type": "Text",
             "val": "#[",
@@ -9252,6 +10471,7 @@ Object {
               "line": 19,
               "nodes": Array [
                 Object {
+                  "column": 15,
                   "filename": "inline-tag.tokens.json",
                   "line": 19,
                   "type": "Text",
@@ -9260,6 +10480,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 8,
             "filename": "inline-tag.tokens.json",
             "isInline": true,
             "line": 19,
@@ -9268,6 +10489,8 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 23,
+            "filename": "inline-tag.tokens.json",
             "line": 19,
             "type": "Text",
             "val": "",
@@ -9275,6 +10498,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "inline-tag.tokens.json",
       "isInline": false,
       "line": 17,
@@ -9301,6 +10525,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "intepolated-elements.tokens.json",
             "line": 1,
             "type": "Text",
@@ -9310,16 +10535,25 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 6,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 1,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'rho\'",
               },
               Object {
+                "column": 11,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 1,
                 "mustEscape": true,
                 "name": "href",
                 "val": "\'#\'",
               },
               Object {
+                "column": 21,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 1,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\'rho--modifier\'",
@@ -9330,6 +10564,7 @@ Object {
               "line": 1,
               "nodes": Array [
                 Object {
+                  "column": 44,
                   "filename": "intepolated-elements.tokens.json",
                   "line": 1,
                   "type": "Text",
@@ -9338,6 +10573,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 5,
             "filename": "intepolated-elements.tokens.json",
             "isInline": true,
             "line": 1,
@@ -9346,6 +10582,7 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 61,
             "filename": "intepolated-elements.tokens.json",
             "line": 1,
             "type": "Text",
@@ -9354,6 +10591,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "intepolated-elements.tokens.json",
       "isInline": false,
       "line": 1,
@@ -9369,6 +10607,7 @@ Object {
         "line": 2,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "intepolated-elements.tokens.json",
             "line": 2,
             "type": "Text",
@@ -9378,16 +10617,25 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 16,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'rho\'",
               },
               Object {
+                "column": 21,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "href",
                 "val": "\'#\'",
               },
               Object {
+                "column": 31,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\'rho--modifier\'",
@@ -9399,6 +10647,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 15,
             "filename": "intepolated-elements.tokens.json",
             "isInline": true,
             "line": 2,
@@ -9407,6 +10656,7 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 54,
             "filename": "intepolated-elements.tokens.json",
             "line": 2,
             "type": "Text",
@@ -9415,6 +10665,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "intepolated-elements.tokens.json",
       "isInline": false,
       "line": 2,
@@ -9430,6 +10681,7 @@ Object {
         "line": 3,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "intepolated-elements.tokens.json",
             "line": 3,
             "type": "Text",
@@ -9439,16 +10691,25 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 16,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 3,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'rho\'",
               },
               Object {
+                "column": 21,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 3,
                 "mustEscape": true,
                 "name": "href",
                 "val": "\'#\'",
               },
               Object {
+                "column": 31,
+                "filename": "intepolated-elements.tokens.json",
+                "line": 3,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\'rho--modifier\'",
@@ -9459,6 +10720,7 @@ Object {
               "line": 3,
               "nodes": Array [
                 Object {
+                  "column": 54,
                   "filename": "intepolated-elements.tokens.json",
                   "line": 3,
                   "type": "Text",
@@ -9467,6 +10729,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 15,
             "filename": "intepolated-elements.tokens.json",
             "isInline": true,
             "line": 3,
@@ -9475,6 +10738,7 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 71,
             "filename": "intepolated-elements.tokens.json",
             "line": 3,
             "type": "Text",
@@ -9483,6 +10747,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "intepolated-elements.tokens.json",
       "isInline": false,
       "line": 3,
@@ -9510,6 +10775,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 5,
+                "filename": "interpolated-mixin.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "href",
                 "val": "url",
@@ -9521,6 +10789,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 14,
                   "filename": "interpolated-mixin.tokens.json",
                   "isInline": true,
                   "line": 2,
@@ -9531,6 +10800,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "interpolated-mixin.tokens.json",
             "isInline": true,
             "line": 2,
@@ -9542,6 +10812,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "interpolated-mixin.tokens.json",
       "line": 1,
       "name": "linkit",
@@ -9555,6 +10826,7 @@ Object {
         "line": 4,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "interpolated-mixin.tokens.json",
             "line": 4,
             "type": "Text",
@@ -9566,12 +10838,14 @@ Object {
             "attrs": Array [],
             "block": null,
             "call": true,
+            "column": 21,
             "filename": "interpolated-mixin.tokens.json",
             "line": 4,
             "name": "linkit",
             "type": "Mixin",
           },
           Object {
+            "column": 52,
             "filename": "interpolated-mixin.tokens.json",
             "line": 4,
             "type": "Text",
@@ -9580,6 +10854,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "interpolated-mixin.tokens.json",
       "isInline": false,
       "line": 4,
@@ -9599,6 +10874,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "interpolation.escape.tokens.json",
       "isInline": false,
       "line": 2,
@@ -9614,12 +10890,14 @@ Object {
         "line": 3,
         "nodes": Array [
           Object {
+            "column": 5,
             "filename": "interpolation.escape.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "some",
           },
           Object {
+            "column": 1,
             "filename": "interpolation.escape.tokens.json",
             "line": 5,
             "type": "Text",
@@ -9627,12 +10905,14 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "interpolation.escape.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "#{text}",
           },
           Object {
+            "column": 1,
             "filename": "interpolation.escape.tokens.json",
             "line": 6,
             "type": "Text",
@@ -9640,12 +10920,14 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "interpolation.escape.tokens.json",
             "line": 6,
             "type": "Text",
             "val": "here",
           },
           Object {
+            "column": 1,
             "filename": "interpolation.escape.tokens.json",
             "line": 7,
             "type": "Text",
@@ -9653,6 +10935,7 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "interpolation.escape.tokens.json",
             "line": 7,
             "type": "Text",
@@ -9660,6 +10943,7 @@ Object {
           },
           Object {
             "buffer": true,
+            "column": 11,
             "filename": "interpolation.escape.tokens.json",
             "isInline": true,
             "line": 7,
@@ -9670,6 +10954,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "interpolation.escape.tokens.json",
       "isInline": false,
       "line": 3,
@@ -9688,7 +10973,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "layout.append.tokens.json",
         "line": 2,
         "path": "../fixtures/append/app-layout.pug",
@@ -9699,6 +10986,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "layout.append.tokens.json",
       "line": 4,
       "mode": "append",
@@ -9708,6 +10996,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.append.tokens.json",
+              "line": 5,
               "mustEscape": true,
               "name": "src",
               "val": "\'foo.js\'",
@@ -9719,6 +11010,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.append.tokens.json",
           "isInline": false,
           "line": 5,
@@ -9730,6 +11022,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.append.tokens.json",
+              "line": 6,
               "mustEscape": true,
               "name": "src",
               "val": "\'bar.js\'",
@@ -9741,6 +11036,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.append.tokens.json",
           "isInline": false,
           "line": 6,
@@ -9762,7 +11058,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "layout.append.without-block.tokens.json",
         "line": 2,
         "path": "../fixtures/append-without-block/app-layout.pug",
@@ -9773,6 +11071,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "layout.append.without-block.tokens.json",
       "line": 4,
       "mode": "append",
@@ -9782,6 +11081,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.append.without-block.tokens.json",
+              "line": 5,
               "mustEscape": true,
               "name": "src",
               "val": "\'foo.js\'",
@@ -9793,6 +11095,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.append.without-block.tokens.json",
           "isInline": false,
           "line": 5,
@@ -9804,6 +11107,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.append.without-block.tokens.json",
+              "line": 6,
               "mustEscape": true,
               "name": "src",
               "val": "\'bar.js\'",
@@ -9815,6 +11121,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.append.without-block.tokens.json",
           "isInline": false,
           "line": 6,
@@ -9836,7 +11143,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "layout.multi.append.prepend.block.tokens.json",
         "line": 1,
         "path": "../fixtures/multi-append-prepend-block/redefine.pug",
@@ -9847,6 +11156,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "layout.multi.append.prepend.block.tokens.json",
       "line": 3,
       "mode": "append",
@@ -9856,11 +11166,17 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 3,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 4,
               "mustEscape": false,
               "name": "class",
               "val": "\'first\'",
             },
             Object {
+              "column": 9,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 4,
               "mustEscape": false,
               "name": "class",
               "val": "\'append\'",
@@ -9871,6 +11187,7 @@ Object {
             "line": 4,
             "nodes": Array [
               Object {
+                "column": 17,
                 "filename": "layout.multi.append.prepend.block.tokens.json",
                 "line": 4,
                 "type": "Text",
@@ -9879,6 +11196,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 2,
           "filename": "layout.multi.append.prepend.block.tokens.json",
           "isInline": false,
           "line": 4,
@@ -9890,6 +11208,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "layout.multi.append.prepend.block.tokens.json",
       "line": 6,
       "mode": "prepend",
@@ -9899,11 +11218,17 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 3,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 7,
               "mustEscape": false,
               "name": "class",
               "val": "\'first\'",
             },
             Object {
+              "column": 9,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 7,
               "mustEscape": false,
               "name": "class",
               "val": "\'prepend\'",
@@ -9914,6 +11239,7 @@ Object {
             "line": 7,
             "nodes": Array [
               Object {
+                "column": 18,
                 "filename": "layout.multi.append.prepend.block.tokens.json",
                 "line": 7,
                 "type": "Text",
@@ -9922,6 +11248,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 2,
           "filename": "layout.multi.append.prepend.block.tokens.json",
           "isInline": false,
           "line": 7,
@@ -9933,6 +11260,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "layout.multi.append.prepend.block.tokens.json",
       "line": 9,
       "mode": "append",
@@ -9942,11 +11270,17 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 3,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 10,
               "mustEscape": false,
               "name": "class",
               "val": "\'last\'",
             },
             Object {
+              "column": 8,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 10,
               "mustEscape": false,
               "name": "class",
               "val": "\'append\'",
@@ -9957,6 +11291,7 @@ Object {
             "line": 10,
             "nodes": Array [
               Object {
+                "column": 16,
                 "filename": "layout.multi.append.prepend.block.tokens.json",
                 "line": 10,
                 "type": "Text",
@@ -9965,6 +11300,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 2,
           "filename": "layout.multi.append.prepend.block.tokens.json",
           "isInline": false,
           "line": 10,
@@ -9976,6 +11312,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "layout.multi.append.prepend.block.tokens.json",
       "line": 12,
       "mode": "prepend",
@@ -9985,11 +11322,17 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 3,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 13,
               "mustEscape": false,
               "name": "class",
               "val": "\'last\'",
             },
             Object {
+              "column": 8,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 13,
               "mustEscape": false,
               "name": "class",
               "val": "\'prepend\'",
@@ -10000,6 +11343,7 @@ Object {
             "line": 13,
             "nodes": Array [
               Object {
+                "column": 17,
                 "filename": "layout.multi.append.prepend.block.tokens.json",
                 "line": 13,
                 "type": "Text",
@@ -10008,6 +11352,7 @@ Object {
             ],
             "type": "Block",
           },
+          "column": 2,
           "filename": "layout.multi.append.prepend.block.tokens.json",
           "isInline": false,
           "line": 13,
@@ -10019,6 +11364,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "layout.multi.append.prepend.block.tokens.json",
       "line": 15,
       "mode": "append",
@@ -10028,6 +11374,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 9,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 16,
               "mustEscape": true,
               "name": "src",
               "val": "\'jquery.js\'",
@@ -10039,6 +11388,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 2,
           "filename": "layout.multi.append.prepend.block.tokens.json",
           "isInline": false,
           "line": 16,
@@ -10050,6 +11400,7 @@ Object {
       "type": "NamedBlock",
     },
     Object {
+      "column": 1,
       "filename": "layout.multi.append.prepend.block.tokens.json",
       "line": 18,
       "mode": "prepend",
@@ -10059,6 +11410,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 9,
+              "filename": "layout.multi.append.prepend.block.tokens.json",
+              "line": 19,
               "mustEscape": true,
               "name": "src",
               "val": "\'foo.js\'",
@@ -10070,6 +11424,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 2,
           "filename": "layout.multi.append.prepend.block.tokens.json",
           "isInline": false,
           "line": 19,
@@ -10091,7 +11446,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "layout.prepend.tokens.json",
         "line": 2,
         "path": "../fixtures/prepend/app-layout.pug",
@@ -10102,6 +11459,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "layout.prepend.tokens.json",
       "line": 4,
       "mode": "prepend",
@@ -10111,6 +11469,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.prepend.tokens.json",
+              "line": 5,
               "mustEscape": true,
               "name": "src",
               "val": "\'foo.js\'",
@@ -10122,6 +11483,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.prepend.tokens.json",
           "isInline": false,
           "line": 5,
@@ -10133,6 +11495,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.prepend.tokens.json",
+              "line": 6,
               "mustEscape": true,
               "name": "src",
               "val": "\'bar.js\'",
@@ -10144,6 +11509,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.prepend.tokens.json",
           "isInline": false,
           "line": 6,
@@ -10165,7 +11531,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "layout.prepend.without-block.tokens.json",
         "line": 2,
         "path": "../fixtures/prepend-without-block/app-layout.pug",
@@ -10176,6 +11544,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "layout.prepend.without-block.tokens.json",
       "line": 4,
       "mode": "prepend",
@@ -10185,6 +11554,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.prepend.without-block.tokens.json",
+              "line": 5,
               "mustEscape": true,
               "name": "src",
               "val": "\'foo.js\'",
@@ -10196,6 +11568,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.prepend.without-block.tokens.json",
           "isInline": false,
           "line": 5,
@@ -10207,6 +11580,9 @@ Object {
           "attributeBlocks": Array [],
           "attrs": Array [
             Object {
+              "column": 10,
+              "filename": "layout.prepend.without-block.tokens.json",
+              "line": 6,
               "mustEscape": true,
               "name": "src",
               "val": "\'bar.js\'",
@@ -10218,6 +11594,7 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "filename": "layout.prepend.without-block.tokens.json",
           "isInline": false,
           "line": 6,
@@ -10248,11 +11625,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 6,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'centered\'",
               },
               Object {
+                "column": 16,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "id",
                 "val": "attributes.id",
@@ -10271,6 +11654,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 10,
+                            "filename": "mixin.attrs.tokens.json",
+                            "line": 4,
                             "mustEscape": true,
                             "name": "class",
                             "val": "attributes.class",
@@ -10282,6 +11668,7 @@ Object {
                           "nodes": Array [
                             Object {
                               "buffer": true,
+                              "column": 33,
                               "filename": "mixin.attrs.tokens.json",
                               "isInline": true,
                               "line": 4,
@@ -10292,6 +11679,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "mixin.attrs.tokens.json",
                         "isInline": false,
                         "line": 4,
@@ -10303,6 +11691,7 @@ Object {
                     "type": "Block",
                   },
                   "buffer": false,
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -10311,6 +11700,7 @@ Object {
                   "val": "if (title)",
                 },
                 Object {
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "line": 5,
                   "type": "MixinBlock",
@@ -10324,6 +11714,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 7,
+                            "filename": "mixin.attrs.tokens.json",
+                            "line": 7,
                             "mustEscape": false,
                             "name": "class",
                             "val": "\'footer\'",
@@ -10337,6 +11730,9 @@ Object {
                               "attributeBlocks": Array [],
                               "attrs": Array [
                                 Object {
+                                  "column": 11,
+                                  "filename": "mixin.attrs.tokens.json",
+                                  "line": 8,
                                   "mustEscape": true,
                                   "name": "href",
                                   "val": "attributes.href",
@@ -10347,6 +11743,7 @@ Object {
                                 "line": 8,
                                 "nodes": Array [
                                   Object {
+                                    "column": 33,
                                     "filename": "mixin.attrs.tokens.json",
                                     "line": 8,
                                     "type": "Text",
@@ -10355,6 +11752,7 @@ Object {
                                 ],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "mixin.attrs.tokens.json",
                               "isInline": true,
                               "line": 8,
@@ -10365,6 +11763,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "mixin.attrs.tokens.json",
                         "isInline": false,
                         "line": 7,
@@ -10376,6 +11775,7 @@ Object {
                     "type": "Block",
                   },
                   "buffer": false,
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": false,
                   "line": 6,
@@ -10386,6 +11786,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 2,
@@ -10397,6 +11798,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 1,
       "name": "centered",
@@ -10412,6 +11814,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 6,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 11,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'stretch\'",
@@ -10424,10 +11829,19 @@ Object {
                 Object {
                   "args": "title",
                   "attributeBlocks": Array [
-                    "attributes",
+                    Object {
+                      "column": 31,
+                      "filename": "mixin.attrs.tokens.json",
+                      "line": 12,
+                      "type": "AttributeBlock",
+                      "val": "attributes",
+                    },
                   ],
                   "attrs": Array [
                     Object {
+                      "column": 21,
+                      "filename": "mixin.attrs.tokens.json",
+                      "line": 12,
                       "mustEscape": false,
                       "name": "class",
                       "val": "\'highlight\'",
@@ -10438,6 +11852,7 @@ Object {
                     "line": 12,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "mixin.attrs.tokens.json",
                         "line": 13,
                         "type": "MixinBlock",
@@ -10446,6 +11861,7 @@ Object {
                     "type": "Block",
                   },
                   "call": true,
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "line": 12,
                   "name": "centered",
@@ -10454,6 +11870,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 11,
@@ -10465,6 +11882,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 10,
       "name": "main",
@@ -10478,10 +11896,19 @@ Object {
         "nodes": Array [
           Object {
             "attributeBlocks": Array [
-              "attributes",
+              Object {
+                "column": 13,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 16,
+                "type": "AttributeBlock",
+                "val": "attributes",
+              },
             ],
             "attrs": Array [
               Object {
+                "column": 6,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 16,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'bottom\'",
@@ -10492,6 +11919,7 @@ Object {
               "line": 16,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "line": 17,
                   "type": "MixinBlock",
@@ -10499,6 +11927,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 16,
@@ -10510,6 +11939,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 15,
       "name": "bottom",
@@ -10527,6 +11957,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 12,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 20,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'First\'",
@@ -10537,6 +11970,7 @@ Object {
               "line": 20,
               "nodes": Array [
                 Object {
+                  "column": 19,
                   "filename": "mixin.attrs.tokens.json",
                   "line": 20,
                   "type": "Text",
@@ -10546,6 +11980,7 @@ Object {
               "type": "Block",
             },
             "call": true,
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "line": 20,
             "name": "centered",
@@ -10556,6 +11991,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 25,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 21,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'Second\'",
@@ -10573,6 +12011,7 @@ Object {
                     "line": 22,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "mixin.attrs.tokens.json",
                         "line": 22,
                         "type": "Text",
@@ -10581,6 +12020,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": false,
                   "line": 22,
@@ -10592,6 +12032,7 @@ Object {
               "type": "Block",
             },
             "call": true,
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "line": 21,
             "name": "centered",
@@ -10602,21 +12043,33 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 25,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 23,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'Third\'",
               },
               Object {
+                "column": 31,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 23,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'foo\'",
               },
               Object {
+                "column": 36,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 23,
                 "mustEscape": true,
                 "name": "href",
                 "val": "\'menu.html\'",
               },
               Object {
+                "column": 54,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 23,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\'bar\'",
@@ -10634,6 +12087,7 @@ Object {
                     "line": 24,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "mixin.attrs.tokens.json",
                         "line": 24,
                         "type": "Text",
@@ -10642,6 +12096,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": false,
                   "line": 24,
@@ -10653,6 +12108,7 @@ Object {
               "type": "Block",
             },
             "call": true,
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "line": 23,
             "name": "centered",
@@ -10663,6 +12119,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 22,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 25,
                 "mustEscape": true,
                 "name": "href",
                 "val": "\'#\'",
@@ -10680,6 +12139,7 @@ Object {
                     "line": 26,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "mixin.attrs.tokens.json",
                         "line": 26,
                         "type": "Text",
@@ -10688,6 +12148,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": false,
                   "line": 26,
@@ -10699,6 +12160,7 @@ Object {
               "type": "Block",
             },
             "call": true,
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "line": 25,
             "name": "main",
@@ -10709,26 +12171,41 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 27,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'foo\'",
               },
               Object {
+                "column": 15,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 27,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\'bar\'",
               },
               Object {
+                "column": 28,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 27,
                 "mustEscape": true,
                 "name": "name",
                 "val": "\'end\'",
               },
               Object {
+                "column": 40,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 27,
                 "mustEscape": true,
                 "name": "id",
                 "val": "\'Last\'",
               },
               Object {
+                "column": 51,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 27,
                 "mustEscape": true,
                 "name": "data-attr",
                 "val": "\'baz\'",
@@ -10746,6 +12223,7 @@ Object {
                     "line": 28,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "mixin.attrs.tokens.json",
                         "line": 28,
                         "type": "Text",
@@ -10754,6 +12232,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": false,
                   "line": 28,
@@ -10765,6 +12244,7 @@ Object {
               "type": "Block",
             },
             "call": true,
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "line": 27,
             "name": "bottom",
@@ -10775,6 +12255,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 11,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 29,
                 "mustEscape": true,
                 "name": "class",
                 "val": "[\'class1\', \'class2\']",
@@ -10782,6 +12265,7 @@ Object {
             ],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "line": 29,
             "name": "bottom",
@@ -10790,6 +12274,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "isInline": false,
       "line": 19,
@@ -10805,20 +12290,35 @@ Object {
         "nodes": Array [
           Object {
             "attributeBlocks": Array [
-              "attributes",
+              Object {
+                "column": 38,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 32,
+                "type": "AttributeBlock",
+                "val": "attributes",
+              },
             ],
             "attrs": Array [
               Object {
+                "column": 6,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 32,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'thing\'",
               },
               Object {
+                "column": 13,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 32,
                 "mustEscape": true,
                 "name": "attr1",
                 "val": "\'foo\'",
               },
               Object {
+                "column": 26,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 32,
                 "mustEscape": true,
                 "name": "attr2",
                 "val": "\'bar\'",
@@ -10830,6 +12330,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 32,
@@ -10841,6 +12342,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 31,
       "name": "foo",
@@ -10848,6 +12350,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "isInline": false,
       "line": 34,
@@ -10857,6 +12360,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "isInline": false,
       "line": 35,
@@ -10869,26 +12373,41 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 6,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 36,
           "mustEscape": true,
           "name": "attr3",
           "val": "\'baz\'",
         },
         Object {
+          "column": 18,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 36,
           "mustEscape": true,
           "name": "data-foo",
           "val": "val",
         },
         Object {
+          "column": 31,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 36,
           "mustEscape": false,
           "name": "data-bar",
           "val": "val",
         },
         Object {
+          "column": 45,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 36,
           "mustEscape": true,
           "name": "class",
           "val": "classes",
         },
         Object {
+          "column": 59,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 36,
           "mustEscape": false,
           "name": "class",
           "val": "\'thunk\'",
@@ -10896,6 +12415,7 @@ Object {
       ],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 36,
       "name": "foo",
@@ -10903,6 +12423,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 38,
       "type": "Comment",
@@ -10916,7 +12437,13 @@ Object {
         "nodes": Array [
           Object {
             "attributeBlocks": Array [
-              "attributes",
+              Object {
+                "column": 6,
+                "filename": "mixin.attrs.tokens.json",
+                "line": 40,
+                "type": "AttributeBlock",
+                "val": "attributes",
+              },
             ],
             "attrs": Array [],
             "block": Object {
@@ -10925,6 +12452,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 29,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": true,
                   "line": 40,
@@ -10935,6 +12463,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 40,
@@ -10946,6 +12475,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 39,
       "name": "work_filmstrip_item",
@@ -10956,11 +12486,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 31,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 41,
           "mustEscape": true,
           "name": "data-profile",
           "val": "\'profile\'",
         },
         Object {
+          "column": 56,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 41,
           "mustEscape": true,
           "name": "data-creator-name",
           "val": "\'name\'",
@@ -10968,6 +12504,7 @@ Object {
       ],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 41,
       "name": "work_filmstrip_item",
@@ -10988,6 +12525,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 4,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": true,
                   "line": 44,
@@ -10998,6 +12536,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 44,
@@ -11014,6 +12553,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 4,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": true,
                   "line": 45,
@@ -11024,6 +12564,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 45,
@@ -11040,6 +12581,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 4,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": true,
                   "line": 46,
@@ -11050,6 +12592,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 46,
@@ -11066,6 +12609,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 4,
                   "filename": "mixin.attrs.tokens.json",
                   "isInline": true,
                   "line": 47,
@@ -11076,6 +12620,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.attrs.tokens.json",
             "isInline": false,
             "line": 47,
@@ -11087,6 +12632,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 43,
       "name": "my-mixin",
@@ -11097,11 +12643,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 50,
           "mustEscape": true,
           "name": "attr3",
           "val": "\"qux\"",
         },
         Object {
+          "column": 3,
+          "filename": "mixin.attrs.tokens.json",
+          "line": 51,
           "mustEscape": true,
           "name": "class",
           "val": "\"baz\"",
@@ -11109,6 +12661,7 @@ Object {
       ],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 49,
       "name": "foo",
@@ -11125,6 +12678,7 @@ Object {
       "attrs": Array [],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "mixin.attrs.tokens.json",
       "line": 54,
       "name": "my-mixin",
@@ -11150,6 +12704,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "mixin.block-tag-behaviour.tokens.json",
+                "line": 3,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'article\'",
@@ -11168,6 +12725,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "mixin.block-tag-behaviour.tokens.json",
                         "isInline": true,
                         "line": 4,
@@ -11178,6 +12736,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.block-tag-behaviour.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -11186,6 +12745,7 @@ Object {
                   "type": "Tag",
                 },
                 Object {
+                  "column": 5,
                   "filename": "mixin.block-tag-behaviour.tokens.json",
                   "line": 5,
                   "type": "MixinBlock",
@@ -11193,6 +12753,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.block-tag-behaviour.tokens.json",
             "isInline": false,
             "line": 3,
@@ -11204,6 +12765,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.block-tag-behaviour.tokens.json",
       "line": 2,
       "name": "article",
@@ -11239,6 +12801,7 @@ Object {
                           "line": 9,
                           "nodes": Array [
                             Object {
+                              "column": 24,
                               "filename": "mixin.block-tag-behaviour.tokens.json",
                               "line": 9,
                               "type": "Text",
@@ -11247,6 +12810,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 22,
                         "filename": "mixin.block-tag-behaviour.tokens.json",
                         "isInline": false,
                         "line": 9,
@@ -11258,6 +12822,7 @@ Object {
                     "type": "Block",
                   },
                   "call": true,
+                  "column": 5,
                   "filename": "mixin.block-tag-behaviour.tokens.json",
                   "line": 9,
                   "name": "article",
@@ -11266,6 +12831,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.block-tag-behaviour.tokens.json",
             "isInline": false,
             "line": 8,
@@ -11276,6 +12842,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin.block-tag-behaviour.tokens.json",
       "isInline": false,
       "line": 7,
@@ -11293,6 +12860,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "mixin.block-tag-behaviour.tokens.json",
+                "line": 12,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'article\'",
@@ -11311,6 +12881,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "mixin.block-tag-behaviour.tokens.json",
                         "isInline": true,
                         "line": 13,
@@ -11321,6 +12892,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.block-tag-behaviour.tokens.json",
                   "isInline": false,
                   "line": 13,
@@ -11336,6 +12908,7 @@ Object {
                     "line": 14,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 15,
                         "type": "MixinBlock",
@@ -11343,6 +12916,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.block-tag-behaviour.tokens.json",
                   "isInline": false,
                   "line": 14,
@@ -11353,6 +12927,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.block-tag-behaviour.tokens.json",
             "isInline": false,
             "line": 12,
@@ -11364,6 +12939,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.block-tag-behaviour.tokens.json",
       "line": 11,
       "name": "article",
@@ -11392,50 +12968,68 @@ Object {
                     "line": 19,
                     "nodes": Array [
                       Object {
+                        "column": 7,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 20,
                         "type": "Text",
                         "val": "I\'m a much longer",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 21,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 21,
                         "type": "Text",
                         "val": "text-only article,",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 22,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 22,
                         "type": "Text",
                         "val": "but you can still",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 23,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 23,
                         "type": "Text",
                         "val": "inline html tags",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 24,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 24,
                         "type": "Text",
                         "val": "in me if you want.",
@@ -11444,6 +13038,7 @@ Object {
                     "type": "Block",
                   },
                   "call": true,
+                  "column": 5,
                   "filename": "mixin.block-tag-behaviour.tokens.json",
                   "line": 19,
                   "name": "article",
@@ -11453,6 +13048,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.block-tag-behaviour.tokens.json",
             "isInline": false,
             "line": 18,
@@ -11463,6 +13059,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin.block-tag-behaviour.tokens.json",
       "isInline": false,
       "line": 17,
@@ -11490,11 +13087,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 8,
+                "filename": "mixin.blocks.tokens.json",
+                "line": 4,
                 "mustEscape": true,
                 "name": "method",
                 "val": "method",
               },
               Object {
+                "column": 23,
+                "filename": "mixin.blocks.tokens.json",
+                "line": 4,
                 "mustEscape": true,
                 "name": "action",
                 "val": "action",
@@ -11506,6 +13109,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": false,
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "isInline": false,
                   "line": 5,
@@ -11517,16 +13121,25 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 11,
+                      "filename": "mixin.blocks.tokens.json",
+                      "line": 6,
                       "mustEscape": true,
                       "name": "type",
                       "val": "\'hidden\'",
                     },
                     Object {
+                      "column": 26,
+                      "filename": "mixin.blocks.tokens.json",
+                      "line": 6,
                       "mustEscape": true,
                       "name": "name",
                       "val": "\'_csrf\'",
                     },
                     Object {
+                      "column": 40,
+                      "filename": "mixin.blocks.tokens.json",
+                      "line": 6,
                       "mustEscape": true,
                       "name": "value",
                       "val": "csrf_token_from_somewhere",
@@ -11538,6 +13151,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "isInline": false,
                   "line": 6,
@@ -11546,6 +13160,7 @@ Object {
                   "type": "Tag",
                 },
                 Object {
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 7,
                   "type": "MixinBlock",
@@ -11553,6 +13168,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 4,
@@ -11564,6 +13180,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "line": 3,
       "name": "form",
@@ -11595,16 +13212,25 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 13,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 12,
                             "mustEscape": true,
                             "name": "type",
                             "val": "\'text\'",
                           },
                           Object {
+                            "column": 26,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 12,
                             "mustEscape": true,
                             "name": "name",
                             "val": "\'query\'",
                           },
                           Object {
+                            "column": 40,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 12,
                             "mustEscape": true,
                             "name": "placeholder",
                             "val": "\'Search\'",
@@ -11616,6 +13242,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "mixin.blocks.tokens.json",
                         "isInline": false,
                         "line": 12,
@@ -11627,11 +13254,17 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 13,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 13,
                             "mustEscape": true,
                             "name": "type",
                             "val": "\'submit\'",
                           },
                           Object {
+                            "column": 28,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 13,
                             "mustEscape": true,
                             "name": "value",
                             "val": "\'Search\'",
@@ -11643,6 +13276,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "mixin.blocks.tokens.json",
                         "isInline": false,
                         "line": 13,
@@ -11654,6 +13288,7 @@ Object {
                     "type": "Block",
                   },
                   "call": true,
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 11,
                   "name": "form",
@@ -11662,6 +13297,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 10,
@@ -11672,6 +13308,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "isInline": false,
       "line": 9,
@@ -11705,16 +13342,25 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 13,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 18,
                             "mustEscape": true,
                             "name": "type",
                             "val": "\'text\'",
                           },
                           Object {
+                            "column": 26,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 18,
                             "mustEscape": true,
                             "name": "name",
                             "val": "\'query\'",
                           },
                           Object {
+                            "column": 40,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 18,
                             "mustEscape": true,
                             "name": "placeholder",
                             "val": "\'Search\'",
@@ -11726,6 +13372,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "mixin.blocks.tokens.json",
                         "isInline": false,
                         "line": 18,
@@ -11737,11 +13384,17 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 13,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 19,
                             "mustEscape": true,
                             "name": "type",
                             "val": "\'submit\'",
                           },
                           Object {
+                            "column": 28,
+                            "filename": "mixin.blocks.tokens.json",
+                            "line": 19,
                             "mustEscape": true,
                             "name": "value",
                             "val": "\'Search\'",
@@ -11753,6 +13406,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "mixin.blocks.tokens.json",
                         "isInline": false,
                         "line": 19,
@@ -11764,6 +13418,7 @@ Object {
                     "type": "Block",
                   },
                   "call": true,
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 17,
                   "name": "form",
@@ -11772,6 +13427,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 16,
@@ -11782,6 +13438,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "isInline": false,
       "line": 15,
@@ -11809,6 +13466,7 @@ Object {
                   "attrs": Array [],
                   "block": null,
                   "call": true,
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 23,
                   "name": "form",
@@ -11817,6 +13475,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 22,
@@ -11827,6 +13486,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "isInline": false,
       "line": 21,
@@ -11844,6 +13504,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "mixin.blocks.tokens.json",
+                "line": 26,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'bar\'",
@@ -11854,6 +13517,7 @@ Object {
               "line": 26,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 27,
                   "type": "MixinBlock",
@@ -11861,6 +13525,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 26,
@@ -11872,6 +13537,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "line": 25,
       "name": "bar",
@@ -11887,6 +13553,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "mixin.blocks.tokens.json",
+                "line": 30,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'foo\'",
@@ -11905,6 +13574,7 @@ Object {
                     "line": 31,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "mixin.blocks.tokens.json",
                         "line": 32,
                         "type": "MixinBlock",
@@ -11913,6 +13583,7 @@ Object {
                     "type": "Block",
                   },
                   "call": true,
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 31,
                   "name": "bar",
@@ -11921,6 +13592,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 30,
@@ -11932,6 +13604,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "line": 29,
       "name": "foo",
@@ -11953,6 +13626,7 @@ Object {
               "line": 35,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 35,
                   "type": "Text",
@@ -11961,6 +13635,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 35,
@@ -11976,6 +13651,7 @@ Object {
               "line": 36,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 36,
                   "type": "Text",
@@ -11984,6 +13660,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 36,
@@ -11999,6 +13676,7 @@ Object {
               "line": 37,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 37,
                   "type": "Text",
@@ -12007,6 +13685,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 37,
@@ -12018,6 +13697,7 @@ Object {
         "type": "Block",
       },
       "call": true,
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "line": 34,
       "name": "foo",
@@ -12033,6 +13713,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 5,
+                "filename": "mixin.blocks.tokens.json",
+                "line": 41,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'baz\'",
@@ -12043,6 +13726,7 @@ Object {
               "line": 41,
               "nodes": Array [
                 Object {
+                  "column": 9,
                   "filename": "mixin.blocks.tokens.json",
                   "line": 42,
                   "type": "MixinBlock",
@@ -12050,6 +13734,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 5,
             "filename": "mixin.blocks.tokens.json",
             "isInline": false,
             "line": 41,
@@ -12061,6 +13746,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "line": 40,
       "name": "baz",
@@ -12076,6 +13762,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 7,
             "filename": "mixin.blocks.tokens.json",
             "isInline": true,
             "line": 44,
@@ -12087,6 +13774,7 @@ Object {
         "type": "Block",
       },
       "call": true,
+      "column": 1,
       "filename": "mixin.blocks.tokens.json",
       "line": 44,
       "name": "baz",
@@ -12110,10 +13798,19 @@ Object {
         "nodes": Array [
           Object {
             "attributeBlocks": Array [
-              "attributes",
+              Object {
+                "column": 8,
+                "filename": "mixin.merge.tokens.json",
+                "line": 2,
+                "type": "AttributeBlock",
+                "val": "attributes",
+              },
             ],
             "attrs": Array [
               Object {
+                "column": 4,
+                "filename": "mixin.merge.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'bar\'",
@@ -12124,6 +13821,7 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 32,
                   "filename": "mixin.merge.tokens.json",
                   "line": 2,
                   "type": "Text",
@@ -12132,6 +13830,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "isInline": false,
             "line": 2,
@@ -12141,15 +13840,27 @@ Object {
           },
           Object {
             "attributeBlocks": Array [
-              "attributes",
+              Object {
+                "column": 13,
+                "filename": "mixin.merge.tokens.json",
+                "line": 3,
+                "type": "AttributeBlock",
+                "val": "attributes",
+              },
             ],
             "attrs": Array [
               Object {
+                "column": 4,
+                "filename": "mixin.merge.tokens.json",
+                "line": 3,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'baz\'",
               },
               Object {
+                "column": 8,
+                "filename": "mixin.merge.tokens.json",
+                "line": 3,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'quux\'",
@@ -12160,6 +13871,7 @@ Object {
               "line": 3,
               "nodes": Array [
                 Object {
+                  "column": 37,
                   "filename": "mixin.merge.tokens.json",
                   "line": 3,
                   "type": "Text",
@@ -12168,6 +13880,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "isInline": false,
             "line": 3,
@@ -12177,7 +13890,13 @@ Object {
           },
           Object {
             "attributeBlocks": Array [
-              "attributes",
+              Object {
+                "column": 4,
+                "filename": "mixin.merge.tokens.json",
+                "line": 4,
+                "type": "AttributeBlock",
+                "val": "attributes",
+              },
             ],
             "attrs": Array [],
             "block": Object {
@@ -12185,6 +13904,7 @@ Object {
               "line": 4,
               "nodes": Array [
                 Object {
+                  "column": 28,
                   "filename": "mixin.merge.tokens.json",
                   "line": 4,
                   "type": "Text",
@@ -12193,6 +13913,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "isInline": false,
             "line": 4,
@@ -12202,15 +13923,27 @@ Object {
           },
           Object {
             "attributeBlocks": Array [
-              "attributes",
+              Object {
+                "column": 8,
+                "filename": "mixin.merge.tokens.json",
+                "line": 5,
+                "type": "AttributeBlock",
+                "val": "attributes",
+              },
             ],
             "attrs": Array [
               Object {
+                "column": 4,
+                "filename": "mixin.merge.tokens.json",
+                "line": 5,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'bar\'",
               },
               Object {
+                "column": 32,
+                "filename": "mixin.merge.tokens.json",
+                "line": 5,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\"baz\"",
@@ -12221,6 +13954,7 @@ Object {
               "line": 5,
               "nodes": Array [
                 Object {
+                  "column": 45,
                   "filename": "mixin.merge.tokens.json",
                   "line": 5,
                   "type": "Text",
@@ -12229,6 +13963,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "isInline": false,
             "line": 5,
@@ -12240,6 +13975,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin.merge.tokens.json",
       "line": 1,
       "name": "foo",
@@ -12257,6 +13993,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "mixin.merge.tokens.json",
+                "line": 8,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'hello\'",
@@ -12264,6 +14003,7 @@ Object {
             ],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 8,
             "name": "foo",
@@ -12274,6 +14014,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "mixin.merge.tokens.json",
+                "line": 9,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'world\'",
@@ -12281,6 +14024,7 @@ Object {
             ],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 9,
             "name": "foo",
@@ -12291,11 +14035,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "mixin.merge.tokens.json",
+                "line": 10,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'hello\'",
               },
               Object {
+                "column": 13,
+                "filename": "mixin.merge.tokens.json",
+                "line": 10,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'world\'",
@@ -12303,6 +14053,7 @@ Object {
             ],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 10,
             "name": "foo",
@@ -12313,11 +14064,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "mixin.merge.tokens.json",
+                "line": 11,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'hello\'",
               },
               Object {
+                "column": 13,
+                "filename": "mixin.merge.tokens.json",
+                "line": 11,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'world\'",
@@ -12325,6 +14082,7 @@ Object {
             ],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 11,
             "name": "foo",
@@ -12335,6 +14093,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 8,
+                "filename": "mixin.merge.tokens.json",
+                "line": 12,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\"hello\"",
@@ -12342,6 +14103,7 @@ Object {
             ],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 12,
             "name": "foo",
@@ -12352,11 +14114,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "mixin.merge.tokens.json",
+                "line": 13,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'hello\'",
               },
               Object {
+                "column": 14,
+                "filename": "mixin.merge.tokens.json",
+                "line": 13,
                 "mustEscape": true,
                 "name": "class",
                 "val": "\"world\"",
@@ -12364,6 +14132,7 @@ Object {
             ],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 13,
             "name": "foo",
@@ -12375,6 +14144,7 @@ Object {
             "attrs": Array [],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 14,
             "name": "foo",
@@ -12383,11 +14153,18 @@ Object {
           Object {
             "args": null,
             "attributeBlocks": Array [
-              "{class: \"hello\"}",
+              Object {
+                "column": 7,
+                "filename": "mixin.merge.tokens.json",
+                "line": 15,
+                "type": "AttributeBlock",
+                "val": "{class: \"hello\"}",
+              },
             ],
             "attrs": Array [],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixin.merge.tokens.json",
             "line": 15,
             "name": "foo",
@@ -12396,6 +14173,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin.merge.tokens.json",
       "isInline": false,
       "line": 7,
@@ -12420,7 +14198,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "mixin-at-end-of-file.tokens.json",
         "line": 1,
         "path": "./auxiliary/mixin-at-end-of-file.pug",
@@ -12446,6 +14226,7 @@ Object {
               "line": 4,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "mixin-at-end-of-file.tokens.json",
                   "line": 4,
                   "type": "Text",
@@ -12454,6 +14235,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin-at-end-of-file.tokens.json",
             "isInline": false,
             "line": 4,
@@ -12465,6 +14247,7 @@ Object {
         "type": "Block",
       },
       "call": true,
+      "column": 1,
       "filename": "mixin-at-end-of-file.tokens.json",
       "line": 3,
       "name": "slide",
@@ -12494,6 +14277,7 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "mixin-block-with-space.tokens.json",
                   "line": 3,
                   "type": "MixinBlock",
@@ -12501,6 +14285,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin-block-with-space.tokens.json",
             "isInline": false,
             "line": 2,
@@ -12512,6 +14297,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin-block-with-space.tokens.json",
       "line": 1,
       "name": "m",
@@ -12526,6 +14312,7 @@ Object {
         "line": 5,
         "nodes": Array [
           Object {
+            "column": 5,
             "filename": "mixin-block-with-space.tokens.json",
             "line": 6,
             "type": "Text",
@@ -12535,6 +14322,7 @@ Object {
         "type": "Block",
       },
       "call": true,
+      "column": 1,
       "filename": "mixin-block-with-space.tokens.json",
       "line": 5,
       "name": "m",
@@ -12565,6 +14353,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 5,
                   "filename": "mixin-hoist.tokens.json",
                   "isInline": true,
                   "line": 3,
@@ -12575,6 +14364,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin-hoist.tokens.json",
             "isInline": false,
             "line": 3,
@@ -12586,6 +14376,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixin-hoist.tokens.json",
       "line": 2,
       "name": "foo",
@@ -12611,6 +14402,7 @@ Object {
                   "attrs": Array [],
                   "block": null,
                   "call": true,
+                  "column": 5,
                   "filename": "mixin-hoist.tokens.json",
                   "line": 7,
                   "name": "foo",
@@ -12619,6 +14411,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixin-hoist.tokens.json",
             "isInline": false,
             "line": 6,
@@ -12629,6 +14422,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixin-hoist.tokens.json",
       "isInline": false,
       "line": 5,
@@ -12648,6 +14442,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "mixin-via-include.tokens.json",
       "line": 1,
       "type": "Comment",
@@ -12660,7 +14455,9 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "mixin-via-include.tokens.json",
         "line": 3,
         "path": "../fixtures/mixin-include.pug",
@@ -12676,6 +14473,7 @@ Object {
       "attrs": Array [],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "mixin-via-include.tokens.json",
       "line": 5,
       "name": "bang",
@@ -12718,6 +14516,7 @@ Object {
                           "nodes": Array [
                             Object {
                               "buffer": true,
+                              "column": 9,
                               "filename": "mixins.rest-args.tokens.json",
                               "isInline": true,
                               "line": 4,
@@ -12728,6 +14527,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "mixins.rest-args.tokens.json",
                         "isInline": false,
                         "line": 4,
@@ -12738,6 +14538,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.rest-args.tokens.json",
                   "key": null,
                   "line": 3,
@@ -12748,6 +14549,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "expr": "tag",
             "filename": "mixins.rest-args.tokens.json",
             "isInline": false,
@@ -12759,6 +14561,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixins.rest-args.tokens.json",
       "line": 1,
       "name": "list",
@@ -12770,6 +14573,7 @@ Object {
       "attrs": Array [],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "mixins.rest-args.tokens.json",
       "line": 6,
       "name": "list",
@@ -12795,6 +14599,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "mixins.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'comment\'",
@@ -12813,6 +14620,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "mixins.tokens.json",
                         "isInline": true,
                         "line": 3,
@@ -12823,6 +14631,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -12834,6 +14643,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 6,
+                      "filename": "mixins.tokens.json",
+                      "line": 4,
                       "mustEscape": false,
                       "name": "class",
                       "val": "\'body\'",
@@ -12845,6 +14657,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 11,
                         "filename": "mixins.tokens.json",
                         "isInline": true,
                         "line": 4,
@@ -12855,6 +14668,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -12865,6 +14679,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixins.tokens.json",
             "isInline": false,
             "line": 2,
@@ -12876,6 +14691,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixins.tokens.json",
       "line": 1,
       "name": "comment",
@@ -12891,6 +14707,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "mixins.tokens.json",
+                "line": 8,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'comment\'",
@@ -12909,6 +14728,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "mixins.tokens.json",
                         "isInline": true,
                         "line": 9,
@@ -12919,6 +14739,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "isInline": false,
                   "line": 9,
@@ -12930,6 +14751,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 6,
+                      "filename": "mixins.tokens.json",
+                      "line": 10,
                       "mustEscape": false,
                       "name": "class",
                       "val": "\'body\'",
@@ -12941,6 +14765,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 11,
                         "filename": "mixins.tokens.json",
                         "isInline": true,
                         "line": 10,
@@ -12951,6 +14776,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "isInline": false,
                   "line": 10,
@@ -12961,6 +14787,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixins.tokens.json",
             "isInline": false,
             "line": 8,
@@ -12972,6 +14799,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixins.tokens.json",
       "line": 7,
       "name": "comment",
@@ -12981,6 +14809,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 1,
+          "filename": "mixins.tokens.json",
+          "line": 12,
           "mustEscape": false,
           "name": "id",
           "val": "\'user\'",
@@ -12998,6 +14829,7 @@ Object {
               "line": 13,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "mixins.tokens.json",
                   "line": 13,
                   "type": "Text",
@@ -13006,6 +14838,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixins.tokens.json",
             "isInline": false,
             "line": 13,
@@ -13017,6 +14850,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "mixins.tokens.json",
+                "line": 14,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'comments\'",
@@ -13033,6 +14869,7 @@ Object {
                   "attrs": Array [],
                   "block": null,
                   "call": true,
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "line": 15,
                   "name": "comment",
@@ -13041,6 +14878,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixins.tokens.json",
             "isInline": false,
             "line": 14,
@@ -13051,6 +14889,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixins.tokens.json",
       "isInline": false,
       "line": 12,
@@ -13079,6 +14918,7 @@ Object {
                     "line": 20,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "mixins.tokens.json",
                         "line": 20,
                         "type": "Text",
@@ -13087,6 +14927,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "isInline": false,
                   "line": 20,
@@ -13102,6 +14943,7 @@ Object {
                     "line": 21,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "mixins.tokens.json",
                         "line": 21,
                         "type": "Text",
@@ -13110,6 +14952,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "isInline": false,
                   "line": 21,
@@ -13125,6 +14968,7 @@ Object {
                     "line": 22,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "mixins.tokens.json",
                         "line": 22,
                         "type": "Text",
@@ -13133,6 +14977,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "mixins.tokens.json",
                   "isInline": false,
                   "line": 22,
@@ -13143,6 +14988,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixins.tokens.json",
             "isInline": false,
             "line": 19,
@@ -13154,6 +15000,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixins.tokens.json",
       "line": 18,
       "name": "list",
@@ -13172,6 +15019,7 @@ Object {
             "attrs": Array [],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixins.tokens.json",
             "line": 25,
             "name": "list",
@@ -13183,6 +15031,7 @@ Object {
             "attrs": Array [],
             "block": null,
             "call": true,
+            "column": 3,
             "filename": "mixins.tokens.json",
             "line": 26,
             "name": "list",
@@ -13191,6 +15040,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixins.tokens.json",
       "isInline": false,
       "line": 24,
@@ -13208,6 +15058,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 6,
+                "filename": "mixins.tokens.json",
+                "line": 29,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'interpolation\'",
@@ -13219,6 +15072,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 20,
                   "filename": "mixins.tokens.json",
                   "isInline": true,
                   "line": 29,
@@ -13229,6 +15083,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixins.tokens.json",
             "isInline": false,
             "line": 29,
@@ -13240,6 +15095,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixins.tokens.json",
       "line": 28,
       "name": "foobar",
@@ -13247,6 +15103,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "mixins.tokens.json",
       "isInline": false,
       "line": 31,
@@ -13260,6 +15117,7 @@ Object {
       "attrs": Array [],
       "block": null,
       "call": true,
+      "column": 1,
       "filename": "mixins.tokens.json",
       "line": 32,
       "name": "#{\'foo\' + suffix}",
@@ -13285,6 +15143,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "mixins-unused.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "class",
                 "val": "\'wtf\'",
@@ -13295,6 +15156,7 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 8,
                   "filename": "mixins-unused.tokens.json",
                   "line": 2,
                   "type": "Text",
@@ -13303,6 +15165,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "mixins-unused.tokens.json",
             "isInline": false,
             "line": 2,
@@ -13314,6 +15177,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "mixins-unused.tokens.json",
       "line": 1,
       "name": "never-called",
@@ -13328,6 +15192,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "mixins-unused.tokens.json",
       "isInline": false,
       "line": 3,
@@ -13353,6 +15218,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 14,
             "filename": "namespaces.tokens.json",
             "line": 1,
             "type": "Text",
@@ -13361,6 +15227,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "namespaces.tokens.json",
       "isInline": false,
       "line": 1,
@@ -13372,6 +15239,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 5,
+          "filename": "namespaces.tokens.json",
+          "line": 2,
           "mustEscape": true,
           "name": "fb:foo",
           "val": "\'bar\'",
@@ -13383,6 +15253,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "namespaces.tokens.json",
       "isInline": false,
       "line": 2,
@@ -13415,6 +15286,7 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "nesting.tokens.json",
                   "line": 2,
                   "type": "Text",
@@ -13423,6 +15295,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "nesting.tokens.json",
             "isInline": false,
             "line": 2,
@@ -13438,6 +15311,7 @@ Object {
               "line": 3,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "nesting.tokens.json",
                   "line": 3,
                   "type": "Text",
@@ -13446,6 +15320,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "nesting.tokens.json",
             "isInline": false,
             "line": 3,
@@ -13475,6 +15350,7 @@ Object {
                           "line": 6,
                           "nodes": Array [
                             Object {
+                              "column": 12,
                               "filename": "nesting.tokens.json",
                               "line": 6,
                               "type": "Text",
@@ -13483,6 +15359,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 9,
                         "filename": "nesting.tokens.json",
                         "isInline": false,
                         "line": 6,
@@ -13498,6 +15375,7 @@ Object {
                           "line": 7,
                           "nodes": Array [
                             Object {
+                              "column": 12,
                               "filename": "nesting.tokens.json",
                               "line": 7,
                               "type": "Text",
@@ -13506,6 +15384,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 9,
                         "filename": "nesting.tokens.json",
                         "isInline": false,
                         "line": 7,
@@ -13516,6 +15395,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "nesting.tokens.json",
                   "isInline": false,
                   "line": 5,
@@ -13526,6 +15406,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "nesting.tokens.json",
             "isInline": false,
             "line": 4,
@@ -13541,6 +15422,7 @@ Object {
               "line": 8,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "nesting.tokens.json",
                   "line": 8,
                   "type": "Text",
@@ -13549,6 +15431,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "nesting.tokens.json",
             "isInline": false,
             "line": 8,
@@ -13559,6 +15442,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "nesting.tokens.json",
       "isInline": false,
       "line": 1,
@@ -13582,28 +15466,38 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "pipeless-comments.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "     .foo",
           },
           Object {
+            "column": 1,
+            "filename": "pipeless-comments.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pipeless-comments.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "	.bar",
           },
           Object {
+            "column": 1,
+            "filename": "pipeless-comments.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pipeless-comments.tokens.json",
             "line": 4,
             "type": "Text",
             "val": ".hey",
@@ -13612,6 +15506,7 @@ Object {
         "type": "Block",
       },
       "buffer": true,
+      "column": 1,
       "filename": "pipeless-comments.tokens.json",
       "line": 1,
       "type": "BlockComment",
@@ -13634,28 +15529,38 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "pipeless-filters.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "    code sample",
           },
           Object {
+            "column": 1,
+            "filename": "pipeless-filters.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pipeless-filters.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
+            "filename": "pipeless-filters.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pipeless-filters.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "# Heading",
@@ -13663,6 +15568,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "pipeless-filters.tokens.json",
       "line": 1,
       "name": "markdown-it",
@@ -13686,23 +15592,30 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "pipeless-tag.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "  what",
           },
           Object {
+            "column": 1,
+            "filename": "pipeless-tag.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pipeless-tag.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "is ",
           },
           Object {
             "buffer": true,
+            "column": 6,
             "filename": "pipeless-tag.tokens.json",
             "isInline": true,
             "line": 3,
@@ -13711,12 +15624,15 @@ Object {
             "val": "\'going\'",
           },
           Object {
+            "column": 16,
+            "filename": "pipeless-tag.tokens.json",
             "line": 3,
             "type": "Text",
             "val": " ",
           },
           Object {
             "buffer": true,
+            "column": 21,
             "filename": "pipeless-tag.tokens.json",
             "isInline": true,
             "line": 3,
@@ -13725,6 +15641,8 @@ Object {
             "val": "\'on\'",
           },
           Object {
+            "column": 29,
+            "filename": "pipeless-tag.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "",
@@ -13732,6 +15650,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "pipeless-tag.tokens.json",
       "isInline": false,
       "line": 1,
@@ -13758,39 +15677,53 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "pre.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "foo",
           },
           Object {
+            "column": 1,
+            "filename": "pre.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pre.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "bar",
           },
           Object {
+            "column": 1,
+            "filename": "pre.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pre.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "baz",
           },
           Object {
+            "column": 1,
+            "filename": "pre.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "pre.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "",
@@ -13798,6 +15731,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "pre.tokens.json",
       "isInline": false,
       "line": 1,
@@ -13821,28 +15755,38 @@ Object {
               "line": 7,
               "nodes": Array [
                 Object {
+                  "column": 5,
+                  "filename": "pre.tokens.json",
                   "line": 8,
                   "type": "Text",
                   "val": "foo",
                 },
                 Object {
+                  "column": 1,
+                  "filename": "pre.tokens.json",
                   "line": 9,
                   "type": "Text",
                   "val": "
 ",
                 },
                 Object {
+                  "column": 5,
+                  "filename": "pre.tokens.json",
                   "line": 9,
                   "type": "Text",
                   "val": "bar",
                 },
                 Object {
+                  "column": 1,
+                  "filename": "pre.tokens.json",
                   "line": 10,
                   "type": "Text",
                   "val": "
 ",
                 },
                 Object {
+                  "column": 5,
+                  "filename": "pre.tokens.json",
                   "line": 10,
                   "type": "Text",
                   "val": "baz",
@@ -13850,6 +15794,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "pre.tokens.json",
             "isInline": true,
             "line": 7,
@@ -13861,6 +15806,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "pre.tokens.json",
       "isInline": false,
       "line": 6,
@@ -13886,6 +15832,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "quotes.tokens.json",
             "line": 1,
             "type": "Text",
@@ -13894,6 +15841,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "quotes.tokens.json",
       "isInline": false,
       "line": 1,
@@ -13909,6 +15857,7 @@ Object {
         "line": 2,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "quotes.tokens.json",
             "line": 2,
             "type": "Text",
@@ -13917,6 +15866,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "quotes.tokens.json",
       "isInline": false,
       "line": 2,
@@ -13936,6 +15886,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "regression.784.tokens.json",
       "isInline": false,
       "line": 1,
@@ -13947,6 +15898,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 1,
+          "filename": "regression.784.tokens.json",
+          "line": 2,
           "mustEscape": false,
           "name": "class",
           "val": "\'url\'",
@@ -13958,6 +15912,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 6,
             "filename": "regression.784.tokens.json",
             "isInline": true,
             "line": 2,
@@ -13968,6 +15923,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "regression.784.tokens.json",
       "isInline": false,
       "line": 2,
@@ -13986,7 +15942,9 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "file": Object {
+        "column": 9,
         "filename": "regression.1794.tokens.json",
         "line": 1,
         "path": "./auxiliary/1794-extends.pug",
@@ -13997,6 +15955,7 @@ Object {
       "type": "Extends",
     },
     Object {
+      "column": 1,
       "filename": "regression.1794.tokens.json",
       "line": 3,
       "mode": "replace",
@@ -14009,7 +15968,9 @@ Object {
             "nodes": Array [],
             "type": "Block",
           },
+          "column": 3,
           "file": Object {
+            "column": 11,
             "filename": "regression.1794.tokens.json",
             "line": 4,
             "path": "./auxiliary/1794-include.pug",
@@ -14040,50 +16001,68 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "script.whitespace.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "if (foo) {",
           },
           Object {
+            "column": 1,
+            "filename": "script.whitespace.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "script.whitespace.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "  ",
           },
           Object {
+            "column": 1,
+            "filename": "script.whitespace.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "script.whitespace.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "  bar();",
           },
           Object {
+            "column": 1,
+            "filename": "script.whitespace.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "script.whitespace.tokens.json",
             "line": 5,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
+            "filename": "script.whitespace.tokens.json",
             "line": 6,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "script.whitespace.tokens.json",
             "line": 6,
             "type": "Text",
             "val": "}",
@@ -14091,6 +16070,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "script.whitespace.tokens.json",
       "isInline": false,
       "line": 1,
@@ -14113,11 +16093,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "scripts.non-js.tokens.json",
+          "line": 1,
           "mustEscape": false,
           "name": "id",
           "val": "\'user-template\'",
         },
         Object {
+          "column": 22,
+          "filename": "scripts.non-js.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "type",
           "val": "\'text/template\'",
@@ -14131,6 +16117,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 3,
+                "filename": "scripts.non-js.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "id",
                 "val": "\'user\'",
@@ -14148,6 +16137,7 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "scripts.non-js.tokens.json",
                         "line": 3,
                         "type": "Text",
@@ -14156,6 +16146,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "scripts.non-js.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -14171,6 +16162,7 @@ Object {
                     "line": 4,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "scripts.non-js.tokens.json",
                         "line": 4,
                         "type": "Text",
@@ -14179,6 +16171,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "scripts.non-js.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -14189,6 +16182,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "scripts.non-js.tokens.json",
             "isInline": false,
             "line": 2,
@@ -14199,6 +16193,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "scripts.non-js.tokens.json",
       "isInline": false,
       "line": 1,
@@ -14210,11 +16205,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 7,
+          "filename": "scripts.non-js.tokens.json",
+          "line": 6,
           "mustEscape": false,
           "name": "id",
           "val": "\'user-template\'",
         },
         Object {
+          "column": 22,
+          "filename": "scripts.non-js.tokens.json",
+          "line": 6,
           "mustEscape": true,
           "name": "type",
           "val": "\'text/template\'",
@@ -14225,28 +16226,38 @@ Object {
         "line": 6,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "scripts.non-js.tokens.json",
             "line": 7,
             "type": "Text",
             "val": "if (foo) {",
           },
           Object {
+            "column": 1,
+            "filename": "scripts.non-js.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "scripts.non-js.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "  bar();",
           },
           Object {
+            "column": 1,
+            "filename": "scripts.non-js.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "scripts.non-js.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "}",
@@ -14254,6 +16265,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "scripts.non-js.tokens.json",
       "isInline": false,
       "line": 6,
@@ -14280,28 +16292,38 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "scripts.tokens.json",
             "line": 2,
             "type": "Text",
             "val": "if (foo) {",
           },
           Object {
+            "column": 1,
+            "filename": "scripts.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "scripts.tokens.json",
             "line": 3,
             "type": "Text",
             "val": "  bar();",
           },
           Object {
+            "column": 1,
+            "filename": "scripts.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "scripts.tokens.json",
             "line": 4,
             "type": "Text",
             "val": "}",
@@ -14309,6 +16331,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "scripts.tokens.json",
       "isInline": false,
       "line": 1,
@@ -14326,6 +16349,7 @@ Object {
         "nodes": Array [
           Object {
             "buffer": true,
+            "column": 7,
             "filename": "scripts.tokens.json",
             "isInline": true,
             "line": 5,
@@ -14336,6 +16360,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "scripts.tokens.json",
       "isInline": false,
       "line": 5,
@@ -14351,6 +16376,7 @@ Object {
         "line": 6,
         "nodes": Array [
           Object {
+            "column": 8,
             "filename": "scripts.tokens.json",
             "line": 6,
             "type": "Text",
@@ -14359,6 +16385,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "scripts.tokens.json",
       "isInline": false,
       "line": 6,
@@ -14375,6 +16402,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "scripts.tokens.json",
       "isInline": false,
       "line": 7,
@@ -14391,6 +16419,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "scripts.tokens.json",
       "isInline": false,
       "line": 8,
@@ -14409,6 +16438,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "self-closing-html.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -14437,6 +16467,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "self-closing-html.tokens.json",
                   "isInline": true,
                   "line": 4,
@@ -14447,6 +16478,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "self-closing-html.tokens.json",
             "isInline": false,
             "line": 3,
@@ -14457,6 +16489,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "self-closing-html.tokens.json",
       "isInline": false,
       "line": 2,
@@ -14482,6 +16515,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 6,
             "filename": "single-period.tokens.json",
             "line": 1,
             "type": "Text",
@@ -14490,6 +16524,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "single-period.tokens.json",
       "isInline": true,
       "line": 1,
@@ -14518,16 +16553,25 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 9,
+                "filename": "source.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "preload",
                 "val": "\'auto\'",
               },
               Object {
+                "column": 25,
+                "filename": "source.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "autobuffer",
                 "val": true,
               },
               Object {
+                "column": 37,
+                "filename": "source.tokens.json",
+                "line": 2,
                 "mustEscape": false,
                 "name": "controls",
                 "val": true,
@@ -14541,6 +16585,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 12,
+                      "filename": "source.tokens.json",
+                      "line": 3,
                       "mustEscape": true,
                       "name": "src",
                       "val": "\'foo\'",
@@ -14552,6 +16599,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "source.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -14563,6 +16611,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 12,
+                      "filename": "source.tokens.json",
+                      "line": 4,
                       "mustEscape": true,
                       "name": "src",
                       "val": "\'bar\'",
@@ -14574,6 +16625,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "source.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -14584,6 +16636,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "source.tokens.json",
             "isInline": false,
             "line": 2,
@@ -14594,6 +16647,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "source.tokens.json",
       "isInline": false,
       "line": 1,
@@ -14633,28 +16687,38 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 7,
+                        "filename": "styles.tokens.json",
                         "line": 4,
                         "type": "Text",
                         "val": "body {",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "styles.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "styles.tokens.json",
                         "line": 5,
                         "type": "Text",
                         "val": "  padding: 50px;",
                       },
                       Object {
+                        "column": 1,
+                        "filename": "styles.tokens.json",
                         "line": 6,
                         "type": "Text",
                         "val": "
 ",
                       },
                       Object {
+                        "column": 7,
+                        "filename": "styles.tokens.json",
                         "line": 6,
                         "type": "Text",
                         "val": "}",
@@ -14662,6 +16726,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -14673,6 +16738,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "styles.tokens.json",
             "isInline": false,
             "line": 2,
@@ -14691,6 +16757,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 9,
+                      "filename": "styles.tokens.json",
+                      "line": 8,
                       "mustEscape": true,
                       "name": "style",
                       "val": "\'color:red;background:green\'",
@@ -14702,6 +16771,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 8,
@@ -14713,6 +16783,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 9,
+                      "filename": "styles.tokens.json",
+                      "line": 9,
                       "mustEscape": true,
                       "name": "style",
                       "val": "{color: \'red\', background: \'green\'}",
@@ -14724,6 +16797,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 9,
@@ -14733,7 +16807,13 @@ Object {
                 },
                 Object {
                   "attributeBlocks": Array [
-                    "{style: \'color:red;background:green\'}",
+                    Object {
+                      "column": 8,
+                      "filename": "styles.tokens.json",
+                      "line": 10,
+                      "type": "AttributeBlock",
+                      "val": "{style: \'color:red;background:green\'}",
+                    },
                   ],
                   "attrs": Array [],
                   "block": Object {
@@ -14742,6 +16822,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 10,
@@ -14751,7 +16832,13 @@ Object {
                 },
                 Object {
                   "attributeBlocks": Array [
-                    "{style: {color: \'red\', background: \'green\'}}",
+                    Object {
+                      "column": 8,
+                      "filename": "styles.tokens.json",
+                      "line": 11,
+                      "type": "AttributeBlock",
+                      "val": "{style: {color: \'red\', background: \'green\'}}",
+                    },
                   ],
                   "attrs": Array [],
                   "block": Object {
@@ -14760,6 +16847,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 11,
@@ -14775,7 +16863,13 @@ Object {
                     "nodes": Array [
                       Object {
                         "attributeBlocks": Array [
-                          "attributes",
+                          Object {
+                            "column": 10,
+                            "filename": "styles.tokens.json",
+                            "line": 13,
+                            "type": "AttributeBlock",
+                            "val": "attributes",
+                          },
                         ],
                         "attrs": Array [],
                         "block": Object {
@@ -14784,6 +16878,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "styles.tokens.json",
                         "isInline": false,
                         "line": 13,
@@ -14795,6 +16890,7 @@ Object {
                     "type": "Block",
                   },
                   "call": false,
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "line": 12,
                   "name": "div",
@@ -14805,6 +16901,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 10,
+                      "filename": "styles.tokens.json",
+                      "line": 14,
                       "mustEscape": true,
                       "name": "style",
                       "val": "\'color:red;background:green\'",
@@ -14812,6 +16911,7 @@ Object {
                   ],
                   "block": null,
                   "call": true,
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "line": 14,
                   "name": "div",
@@ -14822,6 +16922,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 10,
+                      "filename": "styles.tokens.json",
+                      "line": 15,
                       "mustEscape": true,
                       "name": "style",
                       "val": "{color: \'red\', background: \'green\'}",
@@ -14829,6 +16932,7 @@ Object {
                   ],
                   "block": null,
                   "call": true,
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "line": 15,
                   "name": "div",
@@ -14836,6 +16940,7 @@ Object {
                 },
                 Object {
                   "buffer": false,
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 16,
@@ -14847,6 +16952,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 9,
+                      "filename": "styles.tokens.json",
+                      "line": 17,
                       "mustEscape": true,
                       "name": "style",
                       "val": "{color: \'red\', background: bg}",
@@ -14858,6 +16966,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 17,
@@ -14867,7 +16976,13 @@ Object {
                 },
                 Object {
                   "attributeBlocks": Array [
-                    "{style: {color: \'red\', background: bg}}",
+                    Object {
+                      "column": 8,
+                      "filename": "styles.tokens.json",
+                      "line": 18,
+                      "type": "AttributeBlock",
+                      "val": "{style: {color: \'red\', background: bg}}",
+                    },
                   ],
                   "attrs": Array [],
                   "block": Object {
@@ -14876,6 +16991,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "isInline": false,
                   "line": 18,
@@ -14888,6 +17004,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 10,
+                      "filename": "styles.tokens.json",
+                      "line": 19,
                       "mustEscape": true,
                       "name": "style",
                       "val": "{color: \'red\', background: bg}",
@@ -14895,6 +17014,7 @@ Object {
                   ],
                   "block": null,
                   "call": true,
+                  "column": 5,
                   "filename": "styles.tokens.json",
                   "line": 19,
                   "name": "div",
@@ -14903,6 +17023,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "styles.tokens.json",
             "isInline": false,
             "line": 7,
@@ -14913,6 +17034,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "styles.tokens.json",
       "isInline": false,
       "line": 1,
@@ -14932,6 +17054,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "tag.interpolation.tokens.json",
       "isInline": false,
       "line": 2,
@@ -14941,6 +17064,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "tag.interpolation.tokens.json",
       "isInline": false,
       "line": 3,
@@ -14956,6 +17080,7 @@ Object {
         "line": 5,
         "nodes": Array [
           Object {
+            "column": 8,
             "filename": "tag.interpolation.tokens.json",
             "line": 5,
             "type": "Text",
@@ -14964,6 +17089,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "expr": "tag",
       "filename": "tag.interpolation.tokens.json",
       "isInline": false,
@@ -14975,6 +17101,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 8,
+          "filename": "tag.interpolation.tokens.json",
+          "line": 6,
           "mustEscape": true,
           "name": "foo",
           "val": "\'bar\'",
@@ -14985,6 +17114,7 @@ Object {
         "line": 6,
         "nodes": Array [
           Object {
+            "column": 19,
             "filename": "tag.interpolation.tokens.json",
             "line": 6,
             "type": "Text",
@@ -14993,6 +17123,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "expr": "tag",
       "filename": "tag.interpolation.tokens.json",
       "isInline": false,
@@ -15004,6 +17135,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 21,
+          "filename": "tag.interpolation.tokens.json",
+          "line": 7,
           "mustEscape": true,
           "name": "something",
           "val": true,
@@ -15014,6 +17148,7 @@ Object {
         "line": 7,
         "nodes": Array [
           Object {
+            "column": 32,
             "filename": "tag.interpolation.tokens.json",
             "line": 7,
             "type": "Text",
@@ -15022,6 +17157,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "expr": "foo ? \'a\' : \'li\'",
       "filename": "tag.interpolation.tokens.json",
       "isInline": false,
@@ -15049,7 +17185,13 @@ Object {
                     "nodes": Array [
                       Object {
                         "attributeBlocks": Array [
-                          "attributes",
+                          Object {
+                            "column": 11,
+                            "filename": "tag.interpolation.tokens.json",
+                            "line": 16,
+                            "type": "AttributeBlock",
+                            "val": "attributes",
+                          },
                         ],
                         "attrs": Array [],
                         "block": Object {
@@ -15060,11 +17202,17 @@ Object {
                               "attributeBlocks": Array [],
                               "attrs": Array [
                                 Object {
+                                  "column": 12,
+                                  "filename": "tag.interpolation.tokens.json",
+                                  "line": 17,
                                   "mustEscape": false,
                                   "name": "class",
                                   "val": "\'icon\'",
                                 },
                                 Object {
+                                  "column": 18,
+                                  "filename": "tag.interpolation.tokens.json",
+                                  "line": 17,
                                   "mustEscape": true,
                                   "name": "src",
                                   "val": "icon",
@@ -15076,6 +17224,7 @@ Object {
                                 "nodes": Array [],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "tag.interpolation.tokens.json",
                               "isInline": true,
                               "line": 17,
@@ -15084,6 +17233,7 @@ Object {
                               "type": "Tag",
                             },
                             Object {
+                              "column": 9,
                               "filename": "tag.interpolation.tokens.json",
                               "line": 18,
                               "type": "MixinBlock",
@@ -15091,6 +17241,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "tag.interpolation.tokens.json",
                         "isInline": true,
                         "line": 16,
@@ -15101,13 +17252,20 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "consequent": Object {
                     "filename": "tag.interpolation.tokens.json",
                     "line": 12,
                     "nodes": Array [
                       Object {
                         "attributeBlocks": Array [
-                          "attributes",
+                          Object {
+                            "column": 8,
+                            "filename": "tag.interpolation.tokens.json",
+                            "line": 12,
+                            "type": "AttributeBlock",
+                            "val": "attributes",
+                          },
                         ],
                         "attrs": Array [],
                         "block": Object {
@@ -15118,11 +17276,17 @@ Object {
                               "attributeBlocks": Array [],
                               "attrs": Array [
                                 Object {
+                                  "column": 12,
+                                  "filename": "tag.interpolation.tokens.json",
+                                  "line": 13,
                                   "mustEscape": false,
                                   "name": "class",
                                   "val": "\'icon\'",
                                 },
                                 Object {
+                                  "column": 18,
+                                  "filename": "tag.interpolation.tokens.json",
+                                  "line": 13,
                                   "mustEscape": true,
                                   "name": "src",
                                   "val": "icon",
@@ -15134,6 +17298,7 @@ Object {
                                 "nodes": Array [],
                                 "type": "Block",
                               },
+                              "column": 9,
                               "filename": "tag.interpolation.tokens.json",
                               "isInline": true,
                               "line": 13,
@@ -15142,6 +17307,7 @@ Object {
                               "type": "Tag",
                             },
                             Object {
+                              "column": 9,
                               "filename": "tag.interpolation.tokens.json",
                               "line": 14,
                               "type": "MixinBlock",
@@ -15149,6 +17315,7 @@ Object {
                           ],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "tag.interpolation.tokens.json",
                         "isInline": true,
                         "line": 12,
@@ -15167,6 +17334,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tag.interpolation.tokens.json",
             "isInline": false,
             "line": 10,
@@ -15178,6 +17346,7 @@ Object {
         "type": "Block",
       },
       "call": false,
+      "column": 1,
       "filename": "tag.interpolation.tokens.json",
       "line": 9,
       "name": "item",
@@ -15199,6 +17368,7 @@ Object {
               "line": 21,
               "nodes": Array [
                 Object {
+                  "column": 20,
                   "filename": "tag.interpolation.tokens.json",
                   "line": 21,
                   "type": "Text",
@@ -15208,6 +17378,7 @@ Object {
               "type": "Block",
             },
             "call": true,
+            "column": 3,
             "filename": "tag.interpolation.tokens.json",
             "line": 21,
             "name": "item",
@@ -15218,6 +17389,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 9,
+                "filename": "tag.interpolation.tokens.json",
+                "line": 22,
                 "mustEscape": true,
                 "name": "href",
                 "val": "\'/contact\'",
@@ -15228,6 +17402,7 @@ Object {
               "line": 22,
               "nodes": Array [
                 Object {
+                  "column": 26,
                   "filename": "tag.interpolation.tokens.json",
                   "line": 22,
                   "type": "Text",
@@ -15237,6 +17412,7 @@ Object {
               "type": "Block",
             },
             "call": true,
+            "column": 3,
             "filename": "tag.interpolation.tokens.json",
             "line": 22,
             "name": "item",
@@ -15245,6 +17421,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "tag.interpolation.tokens.json",
       "isInline": false,
       "line": 20,
@@ -15264,6 +17441,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": true,
+      "column": 1,
       "filename": "tag-blocks.tokens.json",
       "line": 1,
       "type": "Comment",
@@ -15277,6 +17455,7 @@ Object {
         "line": 2,
         "nodes": Array [
           Object {
+            "column": 5,
             "filename": "tag-blocks.tokens.json",
             "line": 3,
             "type": "Text",
@@ -15291,6 +17470,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": true,
+                  "column": 39,
                   "filename": "tag-blocks.tokens.json",
                   "isInline": true,
                   "line": 3,
@@ -15301,6 +17481,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 33,
             "filename": "tag-blocks.tokens.json",
             "isInline": true,
             "line": 3,
@@ -15309,6 +17490,7 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 58,
             "filename": "tag-blocks.tokens.json",
             "line": 3,
             "type": "Text",
@@ -15316,6 +17498,7 @@ Object {
           },
           Object {
             "buffer": true,
+            "column": 3,
             "filename": "tag-blocks.tokens.json",
             "isInline": false,
             "line": 4,
@@ -15324,6 +17507,7 @@ Object {
             "val": "\'  \'",
           },
           Object {
+            "column": 5,
             "filename": "tag-blocks.tokens.json",
             "line": 5,
             "type": "Text",
@@ -15332,6 +17516,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "tag-blocks.tokens.json",
       "isInline": false,
       "line": 2,
@@ -15365,6 +17550,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 3,
@@ -15376,6 +17562,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "tags.self-closing.tokens.json",
+                "line": 4,
                 "mustEscape": true,
                 "name": "bar",
                 "val": "\'baz\'",
@@ -15387,6 +17576,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 4,
@@ -15403,6 +17593,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 5,
@@ -15414,6 +17605,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "tags.self-closing.tokens.json",
+                "line": 6,
                 "mustEscape": true,
                 "name": "bar",
                 "val": "\'baz\'",
@@ -15425,6 +17619,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 6,
@@ -15440,6 +17635,7 @@ Object {
               "line": 7,
               "nodes": Array [
                 Object {
+                  "column": 7,
                   "filename": "tags.self-closing.tokens.json",
                   "line": 7,
                   "type": "Text",
@@ -15448,6 +17644,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 7,
@@ -15459,6 +17656,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 7,
+                "filename": "tags.self-closing.tokens.json",
+                "line": 8,
                 "mustEscape": true,
                 "name": "bar",
                 "val": "\'baz\'",
@@ -15469,6 +17669,7 @@ Object {
               "line": 8,
               "nodes": Array [
                 Object {
+                  "column": 18,
                   "filename": "tags.self-closing.tokens.json",
                   "line": 8,
                   "type": "Text",
@@ -15477,6 +17678,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 8,
@@ -15493,6 +17695,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "expr": "\'foo\'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
@@ -15504,6 +17707,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 12,
+                "filename": "tags.self-closing.tokens.json",
+                "line": 10,
                 "mustEscape": true,
                 "name": "bar",
                 "val": "\'baz\'",
@@ -15515,6 +17721,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "expr": "\'foo\'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
@@ -15530,6 +17737,7 @@ Object {
               "line": 11,
               "nodes": Array [
                 Object {
+                  "column": 12,
                   "filename": "tags.self-closing.tokens.json",
                   "line": 11,
                   "type": "Text",
@@ -15538,6 +17746,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "expr": "\'foo\'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
@@ -15549,6 +17758,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 12,
+                "filename": "tags.self-closing.tokens.json",
+                "line": 12,
                 "mustEscape": true,
                 "name": "bar",
                 "val": "\'baz\'",
@@ -15559,6 +17771,7 @@ Object {
               "line": 12,
               "nodes": Array [
                 Object {
+                  "column": 23,
                   "filename": "tags.self-closing.tokens.json",
                   "line": 12,
                   "type": "Text",
@@ -15567,6 +17780,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "expr": "\'foo\'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
@@ -15576,6 +17790,7 @@ Object {
           },
           Object {
             "buffer": false,
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "line": 13,
             "type": "Comment",
@@ -15589,6 +17804,7 @@ Object {
               "line": 14,
               "nodes": Array [
                 Object {
+                  "column": 6,
                   "filename": "tags.self-closing.tokens.json",
                   "line": 14,
                   "type": "Text",
@@ -15597,6 +17813,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": true,
             "line": 14,
@@ -15606,6 +17823,7 @@ Object {
           },
           Object {
             "buffer": false,
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "line": 15,
             "type": "Comment",
@@ -15619,6 +17837,7 @@ Object {
               "line": 16,
               "nodes": Array [
                 Object {
+                  "column": 7,
                   "filename": "tags.self-closing.tokens.json",
                   "line": 16,
                   "type": "Text",
@@ -15627,6 +17846,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "tags.self-closing.tokens.json",
             "isInline": true,
             "line": 16,
@@ -15643,6 +17863,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "expr": "
     \'foo\'
   ",
@@ -15655,6 +17876,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "tags.self-closing.tokens.json",
       "isInline": false,
       "line": 2,
@@ -15676,6 +17898,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 8,
+          "filename": "template.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "type",
           "val": "\'text/x-template\'",
@@ -15700,6 +17925,7 @@ Object {
                     "line": 3,
                     "nodes": Array [
                       Object {
+                        "column": 8,
                         "filename": "template.tokens.json",
                         "line": 3,
                         "type": "Text",
@@ -15708,6 +17934,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "template.tokens.json",
                   "isInline": false,
                   "line": 3,
@@ -15723,6 +17950,7 @@ Object {
                     "line": 4,
                     "nodes": Array [
                       Object {
+                        "column": 7,
                         "filename": "template.tokens.json",
                         "line": 4,
                         "type": "Text",
@@ -15731,6 +17959,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "template.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -15741,6 +17970,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "template.tokens.json",
             "isInline": false,
             "line": 2,
@@ -15751,6 +17981,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "template.tokens.json",
       "isInline": false,
       "line": 1,
@@ -15762,6 +17993,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 8,
+          "filename": "template.tokens.json",
+          "line": 6,
           "mustEscape": true,
           "name": "type",
           "val": "\'text/x-template\'",
@@ -15772,28 +18006,38 @@ Object {
         "line": 6,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "template.tokens.json",
             "line": 7,
             "type": "Text",
             "val": "article",
           },
           Object {
+            "column": 1,
+            "filename": "template.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "template.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "  h2 {{title}}",
           },
           Object {
+            "column": 1,
+            "filename": "template.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "template.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "  p {{description}}",
@@ -15801,6 +18045,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "template.tokens.json",
       "isInline": false,
       "line": 6,
@@ -15823,6 +18068,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 8,
+          "filename": "text.tokens.json",
+          "line": 1,
           "mustEscape": true,
           "name": "value",
           "val": "\'\'",
@@ -15833,6 +18081,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 18,
             "filename": "text.tokens.json",
             "line": 1,
             "type": "Text",
@@ -15841,6 +18090,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
       "line": 1,
@@ -15857,6 +18107,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
       "line": 3,
@@ -15873,6 +18124,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
       "line": 5,
@@ -15889,12 +18141,14 @@ Object {
         "line": 7,
         "nodes": Array [
           Object {
+            "column": 5,
             "filename": "text.tokens.json",
             "line": 8,
             "type": "Text",
             "val": "foo",
           },
           Object {
+            "column": 1,
             "filename": "text.tokens.json",
             "line": 9,
             "type": "Text",
@@ -15902,12 +18156,14 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "text.tokens.json",
             "line": 9,
             "type": "Text",
             "val": "bar",
           },
           Object {
+            "column": 1,
             "filename": "text.tokens.json",
             "line": 10,
             "type": "Text",
@@ -15915,6 +18171,7 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "text.tokens.json",
             "line": 10,
             "type": "Text",
@@ -15923,6 +18180,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
       "line": 7,
@@ -15938,61 +18196,83 @@ Object {
         "line": 12,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 13,
             "type": "Text",
             "val": "foo",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 14,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 14,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 15,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 15,
             "type": "Text",
             "val": "",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 16,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 16,
             "type": "Text",
             "val": "bar",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 17,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 17,
             "type": "Text",
             "val": "baz",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 18,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 18,
             "type": "Text",
             "val": "",
@@ -16000,6 +18280,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
       "line": 12,
@@ -16009,61 +18290,83 @@ Object {
       "type": "Tag",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 22,
       "type": "Text",
       "val": "foo",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 23,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 23,
       "type": "Text",
       "val": "",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 24,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 24,
       "type": "Text",
       "val": "",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 25,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 25,
       "type": "Text",
       "val": "bar",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 26,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 26,
       "type": "Text",
       "val": "baz",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 27,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 27,
       "type": "Text",
       "val": "",
@@ -16076,12 +18379,14 @@ Object {
         "line": 28,
         "nodes": Array [
           Object {
+            "column": 5,
             "filename": "text.tokens.json",
             "line": 29,
             "type": "Text",
             "val": "foo",
           },
           Object {
+            "column": 1,
             "filename": "text.tokens.json",
             "line": 30,
             "type": "Text",
@@ -16089,12 +18394,14 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "text.tokens.json",
             "line": 30,
             "type": "Text",
             "val": "  bar",
           },
           Object {
+            "column": 1,
             "filename": "text.tokens.json",
             "line": 31,
             "type": "Text",
@@ -16102,12 +18409,14 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "text.tokens.json",
             "line": 31,
             "type": "Text",
             "val": "    baz",
           },
           Object {
+            "column": 1,
             "filename": "text.tokens.json",
             "line": 32,
             "type": "Text",
@@ -16115,6 +18424,7 @@ Object {
 ",
           },
           Object {
+            "column": 5,
             "filename": "text.tokens.json",
             "line": 32,
             "type": "Text",
@@ -16123,6 +18433,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
       "line": 28,
@@ -16138,50 +18449,68 @@ Object {
         "line": 34,
         "nodes": Array [
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 35,
             "type": "Text",
             "val": "foo",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 36,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 36,
             "type": "Text",
             "val": "  bar",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 37,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 37,
             "type": "Text",
             "val": "    baz",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 38,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 38,
             "type": "Text",
             "val": ".",
           },
           Object {
+            "column": 1,
+            "filename": "text.tokens.json",
             "line": 39,
             "type": "Text",
             "val": "
 ",
           },
           Object {
+            "column": 3,
+            "filename": "text.tokens.json",
             "line": 39,
             "type": "Text",
             "val": "",
@@ -16189,6 +18518,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
       "line": 34,
@@ -16198,39 +18528,53 @@ Object {
       "type": "Tag",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 41,
       "type": "Text",
       "val": "foo",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 42,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 42,
       "type": "Text",
       "val": "  bar",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 43,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 43,
       "type": "Text",
       "val": "    baz",
     },
     Object {
+      "column": 1,
+      "filename": "text.tokens.json",
       "line": 44,
       "type": "Text",
       "val": "
 ",
     },
     Object {
+      "column": 3,
+      "filename": "text.tokens.json",
       "line": 44,
       "type": "Text",
       "val": ".",
@@ -16275,6 +18619,7 @@ Object {
         "line": 2,
         "nodes": Array [
           Object {
+            "column": 7,
             "filename": "text-block.tokens.json",
             "line": 2,
             "type": "Text",
@@ -16284,11 +18629,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 9,
+                "filename": "text-block.tokens.json",
+                "line": 3,
                 "mustEscape": true,
                 "name": "type",
                 "val": "\'text\'",
               },
               Object {
+                "column": 22,
+                "filename": "text-block.tokens.json",
+                "line": 3,
                 "mustEscape": true,
                 "name": "name",
                 "val": "\'user[name]\'",
@@ -16300,6 +18651,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "text-block.tokens.json",
             "isInline": false,
             "line": 3,
@@ -16310,6 +18662,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text-block.tokens.json",
       "isInline": false,
       "line": 2,
@@ -16325,6 +18678,7 @@ Object {
         "line": 5,
         "nodes": Array [
           Object {
+            "column": 7,
             "filename": "text-block.tokens.json",
             "line": 5,
             "type": "Text",
@@ -16334,11 +18688,17 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 9,
+                "filename": "text-block.tokens.json",
+                "line": 6,
                 "mustEscape": true,
                 "name": "type",
                 "val": "\'text\'",
               },
               Object {
+                "column": 22,
+                "filename": "text-block.tokens.json",
+                "line": 6,
                 "mustEscape": true,
                 "name": "name",
                 "val": "\'user[pass]\'",
@@ -16350,6 +18710,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "text-block.tokens.json",
             "isInline": false,
             "line": 6,
@@ -16360,6 +18721,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "text-block.tokens.json",
       "isInline": false,
       "line": 5,
@@ -16385,6 +18747,7 @@ Object {
         "line": 1,
         "nodes": Array [
           Object {
+            "column": 3,
             "filename": "utf8bom.tokens.json",
             "line": 1,
             "type": "Text",
@@ -16393,6 +18756,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "utf8bom.tokens.json",
       "isInline": false,
       "line": 1,
@@ -16412,6 +18776,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "vars.tokens.json",
       "isInline": false,
       "line": 1,
@@ -16421,6 +18786,7 @@ Object {
     },
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "vars.tokens.json",
       "isInline": false,
       "line": 2,
@@ -16432,11 +18798,17 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 3,
+          "filename": "vars.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "class",
           "val": "list",
         },
         Object {
+          "column": 15,
+          "filename": "vars.tokens.json",
+          "line": 3,
           "mustEscape": true,
           "name": "id",
           "val": "foo",
@@ -16448,6 +18820,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "vars.tokens.json",
       "isInline": true,
       "line": 3,
@@ -16467,6 +18840,7 @@ Object {
   "nodes": Array [
     Object {
       "buffer": false,
+      "column": 1,
       "filename": "while.tokens.json",
       "isInline": false,
       "line": 1,
@@ -16488,6 +18862,7 @@ Object {
               "nodes": Array [
                 Object {
                   "buffer": false,
+                  "column": 5,
                   "filename": "while.tokens.json",
                   "isInline": false,
                   "line": 4,
@@ -16504,6 +18879,7 @@ Object {
                     "nodes": Array [
                       Object {
                         "buffer": true,
+                        "column": 7,
                         "filename": "while.tokens.json",
                         "isInline": true,
                         "line": 5,
@@ -16514,6 +18890,7 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "while.tokens.json",
                   "isInline": false,
                   "line": 5,
@@ -16524,6 +18901,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "while.tokens.json",
             "line": 3,
             "test": "x < 10",
@@ -16532,6 +18910,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "while.tokens.json",
       "isInline": false,
       "line": 2,
@@ -16550,6 +18929,7 @@ Object {
   "line": 0,
   "nodes": Array [
     Object {
+      "column": 1,
       "filename": "xml.tokens.json",
       "line": 1,
       "type": "Doctype",
@@ -16559,6 +18939,9 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
+          "column": 10,
+          "filename": "xml.tokens.json",
+          "line": 2,
           "mustEscape": true,
           "name": "term",
           "val": "\'some term\'",
@@ -16570,6 +18953,7 @@ Object {
         "nodes": Array [],
         "type": "Block",
       },
+      "column": 1,
       "filename": "xml.tokens.json",
       "isInline": false,
       "line": 2,
@@ -16585,6 +18969,7 @@ Object {
         "line": 3,
         "nodes": Array [
           Object {
+            "column": 6,
             "filename": "xml.tokens.json",
             "line": 3,
             "type": "Text",
@@ -16593,6 +18978,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "xml.tokens.json",
       "isInline": false,
       "line": 3,
@@ -16633,6 +19019,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 14,
+                            "filename": "yield.tokens.json",
+                            "line": 4,
                             "mustEscape": true,
                             "name": "src",
                             "val": "\'/caustic.js\'",
@@ -16644,6 +19033,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "yield.tokens.json",
                         "isInline": false,
                         "line": 4,
@@ -16655,6 +19045,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 14,
+                            "filename": "yield.tokens.json",
+                            "line": 5,
                             "mustEscape": true,
                             "name": "src",
                             "val": "\'/app.js\'",
@@ -16666,6 +19059,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "yield.tokens.json",
                         "isInline": false,
                         "line": 5,
@@ -16676,7 +19070,9 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "file": Object {
+                    "column": 13,
                     "filename": "yield.tokens.json",
                     "line": 3,
                     "path": "yield-head.pug",
@@ -16689,6 +19085,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield.tokens.json",
             "isInline": false,
             "line": 2,
@@ -16699,6 +19096,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "yield.tokens.json",
       "isInline": false,
       "line": 1,
@@ -16739,6 +19137,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 14,
+                            "filename": "yield-before-conditional.tokens.json",
+                            "line": 4,
                             "mustEscape": true,
                             "name": "src",
                             "val": "\'/caustic.js\'",
@@ -16750,6 +19151,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "yield-before-conditional.tokens.json",
                         "isInline": false,
                         "line": 4,
@@ -16761,6 +19163,9 @@ Object {
                         "attributeBlocks": Array [],
                         "attrs": Array [
                           Object {
+                            "column": 14,
+                            "filename": "yield-before-conditional.tokens.json",
+                            "line": 5,
                             "mustEscape": true,
                             "name": "src",
                             "val": "\'/app.js\'",
@@ -16772,6 +19177,7 @@ Object {
                           "nodes": Array [],
                           "type": "Block",
                         },
+                        "column": 7,
                         "filename": "yield-before-conditional.tokens.json",
                         "isInline": false,
                         "line": 5,
@@ -16782,7 +19188,9 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "file": Object {
+                    "column": 13,
                     "filename": "yield-before-conditional.tokens.json",
                     "line": 3,
                     "path": "yield-before-conditional-head.pug",
@@ -16795,6 +19203,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-before-conditional.tokens.json",
             "isInline": false,
             "line": 2,
@@ -16805,6 +19214,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "yield-before-conditional.tokens.json",
       "isInline": false,
       "line": 1,
@@ -16833,6 +19243,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "yield-before-conditional-head.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "src",
                 "val": "\'/jquery.js\'",
@@ -16844,6 +19257,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-before-conditional-head.tokens.json",
             "isInline": false,
             "line": 2,
@@ -16852,12 +19266,14 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 3,
             "filename": "yield-before-conditional-head.tokens.json",
             "line": 3,
             "type": "YieldBlock",
           },
           Object {
             "alternate": null,
+            "column": 3,
             "consequent": Object {
               "filename": "yield-before-conditional-head.tokens.json",
               "line": 5,
@@ -16866,6 +19282,9 @@ Object {
                   "attributeBlocks": Array [],
                   "attrs": Array [
                     Object {
+                      "column": 12,
+                      "filename": "yield-before-conditional-head.tokens.json",
+                      "line": 5,
                       "mustEscape": true,
                       "name": "src",
                       "val": "\'/jquery.ui.js\'",
@@ -16877,6 +19296,7 @@ Object {
                     "nodes": Array [],
                     "type": "Block",
                   },
+                  "column": 5,
                   "filename": "yield-before-conditional-head.tokens.json",
                   "isInline": false,
                   "line": 5,
@@ -16895,6 +19315,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "yield-before-conditional-head.tokens.json",
       "isInline": false,
       "line": 1,
@@ -16923,6 +19344,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "yield-head.tokens.json",
+                "line": 2,
                 "mustEscape": true,
                 "name": "src",
                 "val": "\'/jquery.js\'",
@@ -16934,6 +19358,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-head.tokens.json",
             "isInline": false,
             "line": 2,
@@ -16942,6 +19367,7 @@ Object {
             "type": "Tag",
           },
           Object {
+            "column": 3,
             "filename": "yield-head.tokens.json",
             "line": 3,
             "type": "YieldBlock",
@@ -16950,6 +19376,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "yield-head.tokens.json",
+                "line": 4,
                 "mustEscape": true,
                 "name": "src",
                 "val": "\'/jquery.ui.js\'",
@@ -16961,6 +19390,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-head.tokens.json",
             "isInline": false,
             "line": 4,
@@ -16971,6 +19401,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "yield-head.tokens.json",
       "isInline": false,
       "line": 1,
@@ -17008,6 +19439,7 @@ Object {
                     "line": 4,
                     "nodes": Array [
                       Object {
+                        "column": 9,
                         "filename": "yield-title.tokens.json",
                         "line": 4,
                         "type": "Text",
@@ -17016,7 +19448,9 @@ Object {
                     ],
                     "type": "Block",
                   },
+                  "column": 5,
                   "file": Object {
+                    "column": 13,
                     "filename": "yield-title.tokens.json",
                     "line": 3,
                     "path": "yield-title-head.pug",
@@ -17029,6 +19463,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-title.tokens.json",
             "isInline": false,
             "line": 2,
@@ -17039,6 +19474,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "yield-title.tokens.json",
       "isInline": false,
       "line": 1,
@@ -17071,6 +19507,7 @@ Object {
               "line": 2,
               "nodes": Array [
                 Object {
+                  "column": 5,
                   "filename": "yield-title-head.tokens.json",
                   "line": 3,
                   "type": "YieldBlock",
@@ -17078,6 +19515,7 @@ Object {
               ],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-title-head.tokens.json",
             "isInline": false,
             "line": 2,
@@ -17089,6 +19527,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "yield-title-head.tokens.json",
+                "line": 4,
                 "mustEscape": true,
                 "name": "src",
                 "val": "\'/jquery.js\'",
@@ -17100,6 +19541,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-title-head.tokens.json",
             "isInline": false,
             "line": 4,
@@ -17111,6 +19553,9 @@ Object {
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
+                "column": 10,
+                "filename": "yield-title-head.tokens.json",
+                "line": 5,
                 "mustEscape": true,
                 "name": "src",
                 "val": "\'/jquery.ui.js\'",
@@ -17122,6 +19567,7 @@ Object {
               "nodes": Array [],
               "type": "Block",
             },
+            "column": 3,
             "filename": "yield-title-head.tokens.json",
             "isInline": false,
             "line": 5,
@@ -17132,6 +19578,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "filename": "yield-title-head.tokens.json",
       "isInline": false,
       "line": 1,
diff --git a/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap b/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
index 0d1576139..7dd657623 100644
--- a/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
@@ -9,16 +9,20 @@ Object {
         "line": 2,
         "nodes": Array [
           Object {
+            "column": 5,
             "line": 3,
             "type": "Text",
             "val": "Hello",
           },
           Object {
+            "column": 1,
             "line": 4,
             "type": "Text",
-            "val": "\n",
+            "val": "
+",
           },
           Object {
+            "column": 5,
             "line": 4,
             "type": "Text",
             "val": "World",
@@ -26,6 +30,7 @@ Object {
         ],
         "type": "Block",
       },
+      "column": 1,
       "isInline": false,
       "line": 2,
       "name": "div",
diff --git a/packages/pug-parser/try.js b/packages/pug-parser/try.js
new file mode 100644
index 000000000..51593e751
--- /dev/null
+++ b/packages/pug-parser/try.js
@@ -0,0 +1,29 @@
+var lex = require('../pug-lexer');
+var parse = require('./');
+
+var filename = 'my-file.pug';
+var src = `
+-
+
+  import { Block } from 'dwayne';
+  import { Block } from 'dwayne';
+
+div(data-foo="bar", k=a.c)
+  a&attributes(attrs)
+  :cdata
+    123
+`;
+var src = `
+script
+  :cdata:uglify-js
+    function myFunc(foo) {
+      return foo;
+    }
+  `;
+var tokens = lex(src, {filename});
+
+console.log(tokens);
+
+var ast = parse(tokens, {filename, src});
+
+console.log(JSON.stringify(ast, null, '  '));
diff --git a/packages/pug-walk/test/index.test.js b/packages/pug-walk/test/index.test.js
index 0bbf15b75..7881da99e 100644
--- a/packages/pug-walk/test/index.test.js
+++ b/packages/pug-walk/test/index.test.js
@@ -11,7 +11,12 @@ test('simple', function () {
     // to replace the node, call `replace(newNode)`
     // return `false` to skip descending
     if (node.type === 'Text') {
-      replace({ type: 'Text', val: 'bar', line: node.line });
+      replace({
+        type: 'Text',
+        val: 'bar',
+        line: node.line,
+        column: node.column
+      });
     }
   }, function after(node, replace) {
     // called before walking the children of `node`
@@ -114,18 +119,22 @@ describe('replace([])', function () {
       if (node.type === 'IncludeFilter') {
         assert(replace.arrayAllowed);
         if (node.name === 'filter1') {
+          var firstFilter = 'filter3';
+
           replace([
             {
               type: 'IncludeFilter',
-              name: 'filter3',
+              name: firstFilter,
               attrs: [],
-              line: node.line
+              line: node.line,
+              column: node.column
             },
             {
               type: 'IncludeFilter',
               name: 'filter4',
               attrs: [],
-              line: node.line
+              line: node.line,
+              column: node.column + firstFilter.length + 1
             }
           ]);
         } else if (node.name === 'filter2') {

From 17c11aeed0454c421b3a0b20f3cd6b87ac6665c8 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 6 Sep 2017 16:26:57 +0100
Subject: [PATCH 24/96] Update test case

---
 packages/pug-parser/test/__snapshots__/index.test.js.snap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index 4fb3c80eb..10738aba3 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -18580,12 +18580,14 @@ Object {
       "val": ".",
     },
     Object {
+      "column": 3,
       "filename": "text.tokens.json",
       "line": 45,
       "type": "Text",
       "val": "foo",
     },
     Object {
+      "column": 1,
       "filename": "text.tokens.json",
       "line": 46,
       "type": "Text",
@@ -18594,6 +18596,7 @@ Object {
     },
     Object {
       "buffer": true,
+      "column": 3,
       "filename": "text.tokens.json",
       "isInline": true,
       "line": 46,

From 39988d583152c8b436465c19b92d9c6562bacab4 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 6 Sep 2017 16:28:02 +0100
Subject: [PATCH 25/96] Publish

 - pug-code-gen@2.0.0
 - pug-filters@2.1.5
 - pug-linker@3.0.3
 - pug-load@2.0.9
 - pug-parser@4.0.0
 - pug-walk@1.1.5
 - pug@2.0.0-rc.4
---
 packages/pug-code-gen/package.json |  2 +-
 packages/pug-filters/package.json  |  8 ++++----
 packages/pug-linker/package.json   |  8 ++++----
 packages/pug-load/package.json     |  6 +++---
 packages/pug-parser/package.json   |  2 +-
 packages/pug-walk/package.json     |  4 ++--
 packages/pug/package.json          | 12 ++++++------
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index 9fe253233..5aefc9621 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-code-gen",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "description": "Default code-generator for pug.  It generates HTML via a JavaScript template function.",
   "keywords": [
     "pug"
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 7163e4eaa..f870784f1 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
@@ -9,7 +9,7 @@
     "clean-css": "^3.3.0",
     "constantinople": "^3.0.1",
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.4",
+    "pug-walk": "^1.1.5",
     "jstransformer": "1.0.0",
     "resolve": "^1.1.6",
     "uglify-js": "^2.6.1"
@@ -23,8 +23,8 @@
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
     "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.8",
-    "pug-parser": "^3.0.1"
+    "pug-load": "^2.0.9",
+    "pug-parser": "^4.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index 6a4a7df8c..f3f47133d 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,18 +1,18 @@
 {
   "name": "pug-linker",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.4"
+    "pug-walk": "^1.1.5"
   },
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.8",
-    "pug-parser": "^3.0.1"
+    "pug-load": "^2.0.9",
+    "pug-parser": "^4.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index c0e7e3c31..ab74d9220 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -1,17 +1,17 @@
 {
   "name": "pug-load",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "The Pug loader is responsible for loading the depenendencies of a given Pug file.",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "object-assign": "^4.1.0",
-    "pug-walk": "^1.1.4"
+    "pug-walk": "^1.1.5"
   },
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-parser": "^3.0.1"
+    "pug-parser": "^4.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index a70d04178..e72b0245f 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-parser",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree)",
   "keywords": [
     "pug"
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index 5bfe16ee8..c0fa60070 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-walk",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Walk and transform a pug AST",
   "keywords": [
     "pug"
@@ -8,7 +8,7 @@
   "dependencies": {},
   "devDependencies": {
     "pug-lexer": "^3.1.0",
-    "pug-parser": "^3.0.1"
+    "pug-parser": "^4.0.0"
   },
   "files": [
     "index.js"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 4fcc931bc..51f5c1f95 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.4",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -20,12 +20,12 @@
   },
   "main": "lib",
   "dependencies": {
-    "pug-code-gen": "^1.1.1",
-    "pug-filters": "^2.1.4",
+    "pug-code-gen": "^2.0.0",
+    "pug-filters": "^2.1.5",
     "pug-lexer": "^3.1.0",
-    "pug-linker": "^3.0.2",
-    "pug-load": "^2.0.8",
-    "pug-parser": "^3.0.1",
+    "pug-linker": "^3.0.3",
+    "pug-load": "^2.0.9",
+    "pug-parser": "^4.0.0",
     "pug-runtime": "^2.0.3",
     "pug-strip-comments": "^1.0.2"
   },

From 8b78976a73cb3e470a36a31791ea24b893afbfc2 Mon Sep 17 00:00:00 2001
From: Nicholas Lee <nicholaslee119@gmail.com>
Date: Mon, 11 Sep 2017 01:59:36 +0900
Subject: [PATCH 26/96] remove unnecessary words (#2865)

---
 packages/pug-parser/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/pug-parser/README.md b/packages/pug-parser/README.md
index 628e6dbd4..cfb4c0d04 100644
--- a/packages/pug-parser/README.md
+++ b/packages/pug-parser/README.md
@@ -87,4 +87,3 @@ Constructor for a Parser class. This is not meant to be used directly unless you
 ## License
 
   MIT
-  kkk

From dd4962320f2575a8aa42d2adb65c295fc5915432 Mon Sep 17 00:00:00 2001
From: Dmitri Beltjukov <dmitri.beltjukov@gmail.com>
Date: Sun, 10 Sep 2017 20:06:15 +0300
Subject: [PATCH 27/96] Replace const with var for 'use strict' in older node
 (#2815)


From 9cb96de9f32957ef2fc49a7cc2ba26f40becb2a4 Mon Sep 17 00:00:00 2001
From: droooney <d.vor7@mail.ru>
Date: Mon, 25 Sep 2017 19:13:53 +0500
Subject: [PATCH 28/96] fixes #2866 (#2867)

---
 packages/pug-code-gen/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pug-code-gen/index.js b/packages/pug-code-gen/index.js
index 9f578ef79..6409d0ad0 100644
--- a/packages/pug-code-gen/index.js
+++ b/packages/pug-code-gen/index.js
@@ -810,7 +810,7 @@ Compiler.prototype = {
    * Compile attribute blocks.
    */
 
-  attributeBlocks(attributeBlocks) {
+  attributeBlocks: function (attributeBlocks) {
     return attributeBlocks && attributeBlocks.slice().map(function(attrBlock){
       return attrBlock.val;
     });

From 201941a7daa81f74e108f48f13b47d2af0d5c1b3 Mon Sep 17 00:00:00 2001
From: droooney <d.vor7@mail.ru>
Date: Mon, 25 Sep 2017 19:14:25 +0500
Subject: [PATCH 29/96] fixes #2863 (#2864)

---
 packages/pug-parser/try.js | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 packages/pug-parser/try.js

diff --git a/packages/pug-parser/try.js b/packages/pug-parser/try.js
deleted file mode 100644
index 51593e751..000000000
--- a/packages/pug-parser/try.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var lex = require('../pug-lexer');
-var parse = require('./');
-
-var filename = 'my-file.pug';
-var src = `
--
-
-  import { Block } from 'dwayne';
-  import { Block } from 'dwayne';
-
-div(data-foo="bar", k=a.c)
-  a&attributes(attrs)
-  :cdata
-    123
-`;
-var src = `
-script
-  :cdata:uglify-js
-    function myFunc(foo) {
-      return foo;
-    }
-  `;
-var tokens = lex(src, {filename});
-
-console.log(tokens);
-
-var ast = parse(tokens, {filename, src});
-
-console.log(JSON.stringify(ast, null, '  '));

From cb56c83850003457f36c093172a837a4ca16b230 Mon Sep 17 00:00:00 2001
From: Alexis Tyler <xo@wvvw.me>
Date: Mon, 16 Oct 2017 23:42:29 +1030
Subject: [PATCH 30/96] added pug template cache to other (#2868)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d425a3961..d923bb9f8 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ Other:
   - [Pug Server](https://github.com/ded/jade-server)  Ideal for building local prototypes apart from any application
   - [pug-ruby](https://github.com/yivo/pug-ruby) gem: Allows to invoke Pug and Jade from Ruby
   - [pug-rails](https://github.com/yivo/pug-rails) gem: Integrates Pug and Jade into your Rails application
-
+  - [cache-pug-templates](https://github.com/ladjs/cache-pug-templates) Cache Pug templates for [Lad](https://github.com/ladjs/lad)/[Koa](https://github.com/koajs/koa)/[Express](https://github.com/expressjs/express)/[Connect](https://github.com/senchalabs/connect) with [Redis](https://redis.io/)
 
 
 ## Backers

From 926f7c720112cac76cfedb003e25e9f43d3a1767 Mon Sep 17 00:00:00 2001
From: Florian Chrometz <floler@users.noreply.github.com>
Date: Wed, 18 Oct 2017 20:01:24 +0200
Subject: [PATCH 31/96] small spelling errors fixed (#2885)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d923bb9f8..34f5548e2 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 Full documentation is at [pugjs.org](https://pugjs.org/)
 
- Pug is a high performance template engine heavily influenced by [Haml](http://haml.info/)
+ Pug is a high-performance template engine heavily influenced by [Haml](http://haml.info/)
  and implemented with JavaScript for [Node.js](http://nodejs.org) and browsers. For bug reports,
  feature requests and questions, [open an issue](https://github.com/pugjs/pug/issues/new).
  For discussion join the [chat room](https://gitter.im/pugjs/pug).
@@ -21,11 +21,11 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 
 ## Rename from "Jade"
 
-This project was formerly known as "Jade." However, it has been revealed to us that "Jade" is a registered trademark, and as a result a rename is needed. After some discussion among the maintainers, **"Pug"** has been chosen as the new name for this project. The next major version will carry "pug" as the package name.
+This project was formerly known as "Jade." However, it has been revealed to us that "Jade" is a registered trademark, and as a result, a rename is needed. After some discussion among the maintainers, **"Pug"** has been chosen as the new name for this project. The next major version will carry "pug" as the package name.
 
 If your package or app currently uses `jade`, don't worry: we have secured permissions to continue to occupy that package name, although all new versions will be released under `pug`.
 
-Before the renaming, we had already begun working on an incompatible Jade 2.0.0. We have then made it so that this new major version bump will coincide with the rename to Pug. Therefore, upgrading from Jade to Pug will be the same process as upgrading any other package with a major version bump. Currently, Pug 2.0.0 is still under beta stage, and there are several syntactic differences we have deprecated and removed. Such differences are documented at [#2305](https://github.com/pugjs/pug/issues/2305).
+Before the renaming, we had already begun working on an incompatible Jade 2.0.0. We have then made it so that this new major version bump will coincide with the rename to Pug. Therefore, upgrading from Jade to Pug will be the same process as upgrading any other package with a major version bump. Currently, Pug 2.0.0 is still in beta stage, and there are several syntactic differences we have deprecated and removed. Such differences are documented at [#2305](https://github.com/pugjs/pug/issues/2305).
 
 The website and documentation for Pug are still being updated, but if you are new to Pug, you should get started with the new syntax and install the Pug package on npm.
 

From 72fbf6a13b01e196bb8d0d42fd0c0104026263d1 Mon Sep 17 00:00:00 2001
From: droooney <d.vor7@mail.ru>
Date: Fri, 26 Jan 2018 19:16:35 +0500
Subject: [PATCH 32/96] Apply filters to includes in right-to-left order
 (#2932)

[fixes #2929]
---
 packages/pug-filters/lib/handle-filters.js         |  4 ++--
 .../test/__snapshots__/index.test.js.snap          |  2 +-
 .../test/cases/filters.include.input.json          |  9 ++++++++-
 packages/pug-filters/test/index.test.js            |  2 +-
 packages/pug-filters/test/update-test-cases.js     |  2 +-
 .../test/__snapshots__/index.test.js.snap          | 14 ++++++++++----
 packages/pug-lexer/test/cases/filters.include.pug  |  2 +-
 packages/pug-lexer/test/index.test.js              |  2 +-
 .../test/__snapshots__/index.test.js.snap          | 14 +++++++++++---
 .../test/cases/filters.include.tokens.json         | 13 +++++++------
 packages/pug-strip-comments/test/index.test.js     |  2 +-
 packages/pug/test/__snapshots__/pug.test.js.snap   |  8 +++-----
 12 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/packages/pug-filters/lib/handle-filters.js b/packages/pug-filters/lib/handle-filters.js
index ce763f146..fc00fb0b4 100644
--- a/packages/pug-filters/lib/handle-filters.js
+++ b/packages/pug-filters/lib/handle-filters.js
@@ -19,13 +19,13 @@ function handleFilters(ast, filters, options, filterAliases) {
       node.type = 'Text';
       node.val = filterWithFallback(node, text, attrs);
     } else if (node.type === 'RawInclude' && node.filters.length) {
-      var firstFilter = node.filters.shift();
+      var firstFilter = node.filters.pop();
       var attrs = getAttributes(firstFilter, options);
       var filename = attrs.filename = node.file.fullPath;
       var str = node.file.str;
       node.type = 'Text';
       node.val = filterFileWithFallback(firstFilter, filename, str, attrs);
-      node.filters.forEach(function (filter) {
+      node.filters.slice().reverse().forEach(function (filter) {
         var attrs = getAttributes(filter, options);
         attrs.filename = filename;
         node.val = filterWithFallback(filter, node.val, attrs);
diff --git a/packages/pug-filters/test/__snapshots__/index.test.js.snap b/packages/pug-filters/test/__snapshots__/index.test.js.snap
index b304bd56b..720fd8014 100644
--- a/packages/pug-filters/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-filters/test/__snapshots__/index.test.js.snap
@@ -404,7 +404,7 @@ exports[`test cases/filters.include.input.json 1`] = `
                         \"type\": \"Text\",
                         \"line\": 7,
                         \"filename\": \"filters.include.tokens.json\",
-                        \"val\": \"(function() {\\n  var math;\\n\\n  math = {\\n    square: function(value) {\\n      return value * value;\\n    }\\n  };\\n\\n}).call(this);\\n\"
+                        \"val\": \"<![CDATA[(function() {\\n  var math;\\n\\n  math = {\\n    square: function(value) {\\n      return value * value;\\n    }\\n  };\\n\\n}).call(this);\\n]]>\"
                       }
                     ],
                     \"line\": 6,
diff --git a/packages/pug-filters/test/cases/filters.include.input.json b/packages/pug-filters/test/cases/filters.include.input.json
index 423856166..c6f57b176 100644
--- a/packages/pug-filters/test/cases/filters.include.input.json
+++ b/packages/pug-filters/test/cases/filters.include.input.json
@@ -102,6 +102,13 @@
                         "line": 7,
                         "filename": "filters.include.tokens.json",
                         "filters": [
+                          {
+                            "type": "IncludeFilter",
+                            "name": "cdata",
+                            "attrs": [],
+                            "line": 7,
+                            "filename": "filters.include.tokens.json"
+                          },
                           {
                             "type": "IncludeFilter",
                             "name": "coffee-script",
@@ -150,4 +157,4 @@
   ],
   "line": 0,
   "filename": "filters.include.tokens.json"
-}
\ No newline at end of file
+}
diff --git a/packages/pug-filters/test/index.test.js b/packages/pug-filters/test/index.test.js
index 60e4f8efa..01115ab41 100644
--- a/packages/pug-filters/test/index.test.js
+++ b/packages/pug-filters/test/index.test.js
@@ -39,7 +39,7 @@ testCases.forEach(function (filename) {
       handleFilters(JSON.parse(read(filename)), customFilters);
       throw new Error('Expected ' + filename + ' to throw an exception.');
     } catch (ex) {
-      if (!ex || !ex.code || !ex.code.indexOf('PUG:') === 0) throw ex;
+      if (!ex || !ex.code || ex.code.indexOf('PUG:') !== 0) throw ex;
       actual = {
         msg: ex.msg,
         code: ex.code,
diff --git a/packages/pug-filters/test/update-test-cases.js b/packages/pug-filters/test/update-test-cases.js
index dfbb56b19..e97423f3e 100644
--- a/packages/pug-filters/test/update-test-cases.js
+++ b/packages/pug-filters/test/update-test-cases.js
@@ -18,7 +18,7 @@ function getError (input, filename) {
     handleFilters(input, customFilters);
     throw new Error('Expected ' + filename + ' to throw an exception.');
   } catch (ex) {
-    if (!ex || !ex.code || !ex.code.indexOf('PUG:') === 0) throw ex;
+    if (!ex || !ex.code || ex.code.indexOf('PUG:') !== 0) throw ex;
     return {
       msg: ex.msg,
       code: ex.code,
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index 3c77b05e3..c739879a2 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -6939,15 +6939,21 @@ Array [
     "col": 14,
     "line": 7,
     "type": "filter",
+    "val": "cdata",
+  },
+  Object {
+    "col": 20,
+    "line": 7,
+    "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 28,
+    "col": 34,
     "line": 7,
     "type": "start-attributes",
   },
   Object {
-    "col": 29,
+    "col": 35,
     "line": 7,
     "mustEscape": true,
     "name": "minify",
@@ -6955,12 +6961,12 @@ Array [
     "val": "false",
   },
   Object {
-    "col": 41,
+    "col": 47,
     "line": 7,
     "type": "end-attributes",
   },
   Object {
-    "col": 43,
+    "col": 49,
     "line": 7,
     "type": "path",
     "val": "include-filter-coffee.coffee",
diff --git a/packages/pug-lexer/test/cases/filters.include.pug b/packages/pug-lexer/test/cases/filters.include.pug
index e7ea3db3d..e5083ae5f 100644
--- a/packages/pug-lexer/test/cases/filters.include.pug
+++ b/packages/pug-lexer/test/cases/filters.include.pug
@@ -4,4 +4,4 @@ html
     script
       include:coffee-script(minify=true) include-filter-coffee.coffee
     script
-      include:coffee-script(minify=false) include-filter-coffee.coffee
+      include:cdata:coffee-script(minify=false) include-filter-coffee.coffee
diff --git a/packages/pug-lexer/test/index.test.js b/packages/pug-lexer/test/index.test.js
index 325bbd246..19412c19f 100644
--- a/packages/pug-lexer/test/index.test.js
+++ b/packages/pug-lexer/test/index.test.js
@@ -24,7 +24,7 @@ fs.readdirSync(edir).forEach(function (testCase) {
         lex(fs.readFileSync(edir + testCase, 'utf8'), {filename: edir + testCase});
         throw new Error('Expected ' + testCase + ' to throw an exception.');
       } catch (ex) {
-        if (!ex || !ex.code || !ex.code.indexOf('PUG:') === 0) throw ex;
+        if (!ex || !ex.code || ex.code.indexOf('PUG:') !== 0) throw ex;
         actual = {
           msg: ex.msg,
           code: ex.code,
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index 10738aba3..f5e7c5ee2 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -7205,7 +7205,7 @@ Object {
                       Object {
                         "column": 7,
                         "file": Object {
-                          "column": 43,
+                          "column": 49,
                           "filename": "filters.include.tokens.json",
                           "line": 7,
                           "path": "include-filter-coffee.coffee",
@@ -7213,10 +7213,18 @@ Object {
                         },
                         "filename": "filters.include.tokens.json",
                         "filters": Array [
+                          Object {
+                            "attrs": Array [],
+                            "column": 14,
+                            "filename": "filters.include.tokens.json",
+                            "line": 7,
+                            "name": "cdata",
+                            "type": "IncludeFilter",
+                          },
                           Object {
                             "attrs": Array [
                               Object {
-                                "column": 29,
+                                "column": 35,
                                 "filename": "filters.include.tokens.json",
                                 "line": 7,
                                 "mustEscape": true,
@@ -7224,7 +7232,7 @@ Object {
                                 "val": "false",
                               },
                             ],
-                            "column": 14,
+                            "column": 20,
                             "filename": "filters.include.tokens.json",
                             "line": 7,
                             "name": "coffee-script",
diff --git a/packages/pug-parser/test/cases/filters.include.tokens.json b/packages/pug-parser/test/cases/filters.include.tokens.json
index 779425bdb..a2c1ac153 100644
--- a/packages/pug-parser/test/cases/filters.include.tokens.json
+++ b/packages/pug-parser/test/cases/filters.include.tokens.json
@@ -18,12 +18,13 @@
 {"type":"tag","line":6,"col":5,"val":"script"}
 {"type":"indent","line":7,"col":1,"val":6}
 {"type":"include","line":7,"col":7}
-{"type":"filter","line":7,"col":14,"val":"coffee-script"}
-{"type":"start-attributes","line":7,"col":28}
-{"type":"attribute","line":7,"col":29,"name":"minify","val":"false","mustEscape":true}
-{"type":"end-attributes","line":7,"col":41}
-{"type":"path","line":7,"col":43,"val":"include-filter-coffee.coffee"}
+{"type":"filter","line":7,"col":14,"val":"cdata"}
+{"type":"filter","line":7,"col":20,"val":"coffee-script"}
+{"type":"start-attributes","line":7,"col":34}
+{"type":"attribute","line":7,"col":35,"name":"minify","val":"false","mustEscape":true}
+{"type":"end-attributes","line":7,"col":47}
+{"type":"path","line":7,"col":49,"val":"include-filter-coffee.coffee"}
 {"type":"outdent","line":8,"col":5}
 {"type":"outdent","line":8,"col":3}
 {"type":"outdent","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
\ No newline at end of file
+{"type":"eos","line":8,"col":1}
diff --git a/packages/pug-strip-comments/test/index.test.js b/packages/pug-strip-comments/test/index.test.js
index fb0dfdea7..7f3b51c18 100644
--- a/packages/pug-strip-comments/test/index.test.js
+++ b/packages/pug-strip-comments/test/index.test.js
@@ -39,7 +39,7 @@ fs.readdirSync(edir).forEach(function (testCase) {
         strip(input);
         throw new Error('Expected ' + testCase + ' to throw an exception.');
       } catch (ex) {
-        if (!ex || !ex.code || !ex.code.indexOf('PUG:') === 0) throw ex;
+        if (!ex || !ex.code || ex.code.indexOf('PUG:') !== 0) throw ex;
         expect({
           msg: ex.msg,
           code: ex.code,
diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
index 1d90c354a..01f24328f 100644
--- a/packages/pug/test/__snapshots__/pug.test.js.snap
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -74,11 +74,9 @@ function pug_rethrow(n, e, r, t) {
         return (t == r ? \"  > \" : \"    \") + t + \"| \" + n;
       })
       .join(\"\\n\");
-  throw (
-    (n.path = e),
-    (n.message = (e || \"Pug\") + \":\" + r + \"\\n\" + i + \"\\n\\n\" + n.message),
-    n
-  );
+  throw ((n.path = e),
+  (n.message = (e || \"Pug\") + \":\" + r + \"\\n\" + i + \"\\n\\n\" + n.message),
+  n);
 }
 function template(locals) {
   var pug_html = \"\",

From af94a9f103785e7d6c46d64c069eb3f512ba6f9a Mon Sep 17 00:00:00 2001
From: Kyle <kylekatarnls@users.noreply.github.com>
Date: Fri, 26 Jan 2018 15:17:17 +0100
Subject: [PATCH 33/96] #2887 Reorganize other languages section (#2928)

---
 README.md | 52 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 34f5548e2..83e2700b6 100644
--- a/README.md
+++ b/README.md
@@ -134,25 +134,51 @@ $ pug --client --no-debug filename.pug
 
 which will produce `filename.js` containing the compiled template.
 
-## Additional Resources
-
-Tutorials:
+## Tutorials
 
   - cssdeck interactive [Pug syntax tutorial](http://cssdeck.com/labs/learning-the-jade-templating-engine-syntax)
   - cssdeck interactive [Pug logic tutorial](http://cssdeck.com/labs/jade-templating-tutorial-codecast-part-2)
   - [Pug について。](https://gist.github.com/japboy/5402844) (A Japanese Tutorial)
 
-Implementations in other languages:
+## Implementations in other languages
+
+### Ports in other languages
+
+Ports with very close syntax, adapted to other languages:
+
+  - [PHP](https://github.com/pug-php/pug)
+  - [Java](https://github.com/neuland/jade4j)
+  - [Python](https://github.com/matannoam/pypugjs)
+  - [Ruby](https://github.com/yivo/pug-ruby)
+  - [C# (ASP.NET Core)](https://github.com/AspNetMonsters/pugzor)
+
+### Equivalents in other languages
 
-  - [Larpug - Pug for Laravel](https://github.com/acidjazz/larpug)
-  - [php](https://github.com/pug-php/pug)
-  - [scala](https://scalate.github.io/scalate/documentation/scaml-reference.html)
-  - [ruby](https://github.com/slim-template/slim)
-  - [python](https://github.com/matannoam/pypugjs)
-  - [java](https://github.com/neuland/jade4j)
-  - [C# ASP.NET Core](https://github.com/AspNetMonsters/pugzor)
+Templates engines available in other languages with a different syntax but a similar philosophy:
 
-Other:
+  - [Scaml for Scala](https://scalate.github.io/scalate/documentation/scaml-reference.html)
+  - [Slim for Ruby](https://github.com/slim-template/slim) (should not be confused with Slim PHP framework)
+  - [HAML for Ruby](http://haml.info/)
+  
+### Framework implementations/adapters
+
+Embedded view engines for frameworks:
+
+  - [Laravel](https://github.com/BKWLD/laravel-pug)
+  - [Symfony](https://github.com/pug-php/pug-symfony)
+  - [Phalcon](https://github.com/pug-php/pug-phalcon)
+  - [CodeIgniter](https://github.com/pug-php/ci-pug-engine)
+  - [Yii 2](https://github.com/pug-php/pug-yii2)
+  - [Slim 3](https://github.com/pug-php/pug-slim)
+  - [Silex (implementation example)](https://gist.github.com/kylekatarnls/ba13e4361ab14f4ff5d2a5775eb0cc10)
+  - [Lumen](https://github.com/BKWLD/laravel-pug#use-in-lumen)
+  - [Rails](https://github.com/yivo/pug-rails)
+
+### CMS plugins
+
+  - [WordPress](https://github.com/welaika/wordless)
+
+## Additional Resources
 
   - [Emacs Mode](https://github.com/brianc/jade-mode)
   - [Vim Syntax](https://github.com/digitaltoad/vim-pug)
@@ -161,8 +187,6 @@ Other:
   - [html2pug](https://github.com/donpark/html2jade) converter
   - [pug2php](https://github.com/SE7ENSKY/jade2php) converter
   - [Pug Server](https://github.com/ded/jade-server)  Ideal for building local prototypes apart from any application
-  - [pug-ruby](https://github.com/yivo/pug-ruby) gem: Allows to invoke Pug and Jade from Ruby
-  - [pug-rails](https://github.com/yivo/pug-rails) gem: Integrates Pug and Jade into your Rails application
   - [cache-pug-templates](https://github.com/ladjs/cache-pug-templates) Cache Pug templates for [Lad](https://github.com/ladjs/lad)/[Koa](https://github.com/koajs/koa)/[Express](https://github.com/expressjs/express)/[Connect](https://github.com/senchalabs/connect) with [Redis](https://redis.io/)
 
 

From bd9e0de85b5975d1929887cc53722b02520a5597 Mon Sep 17 00:00:00 2001
From: Denys Pavlov <denys.pavlov@gmail.com>
Date: Mon, 5 Feb 2018 18:32:00 +0800
Subject: [PATCH 34/96] [pug-lexer] Relax class name requirements (#2948)

* Allow class names to begin with single dash, 0-9, a-z, and underscore
* Add test case that passes with change, fails without change

Fixes #2907
---
 packages/pug-lexer/index.js                   | 11 ++---
 .../test/__snapshots__/index.test.js.snap     | 44 ++++++++++++++++---
 packages/pug-lexer/test/cases/classes.pug     |  3 ++
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index f901332d6..73114efea 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -403,20 +403,17 @@ Lexer.prototype = {
    */
 
   className: function() {
-    var tok = this.scan(/^\.(-?-?[_a-z][_a-z0-9\-]*)/i, 'class');
+    var tok = this.scan(/^\.([_a-z0-9\-]*[_a-z][_a-z0-9\-]*)/i, 'class');
     if (tok) {
       this.tokens.push(tok);
       this.incrementColumn(tok.val.length);
       return true;
     }
-    if (/^\.\-/i.test(this.input)) {
-      this.error('INVALID_CLASS_NAME', 'If a class name begins with a "-" or "--", it must be followed by a letter or underscore.');
-    }
-    if (/^\.[0-9]/i.test(this.input)) {
-      this.error('INVALID_CLASS_NAME', 'Class names must begin with "-", "_" or a letter.');
+    if (/^\.[_a-z0-9\-]+/i.test(this.input)) {
+      this.error('INVALID_CLASS_NAME', 'Class names must contain at least one letter or underscore.');
     }
     if (/^\./.test(this.input)) {
-      this.error('INVALID_CLASS_NAME', '"' + /.[^ \t\(\#\.\:]*/.exec(this.input.substr(1))[0] + '" is not a valid class name.  Class names must begin with "-", "_" or a letter and can only contain "_", "-", a-z and 0-9.');
+      this.error('INVALID_CLASS_NAME', '"' + /.[^ \t\(\#\.\:]*/.exec(this.input.substr(1))[0] + '" is not a valid class name.  Class names can only contain "_", "-", a-z and 0-9, and must contain at least one of "_", or a-z');
     }
   },
 
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index c739879a2..527b5da6b 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -3464,12 +3464,46 @@ Array [
   },
   Object {
     "col": 1,
-    "line": 12,
+    "line": 13,
     "type": "newline",
   },
   Object {
     "col": 1,
-    "line": 12,
+    "line": 13,
+    "type": "tag",
+    "val": "a",
+  },
+  Object {
+    "col": 2,
+    "line": 13,
+    "type": "class",
+    "val": "-foo",
+  },
+  Object {
+    "col": 1,
+    "line": 14,
+    "type": "newline",
+  },
+  Object {
+    "col": 1,
+    "line": 14,
+    "type": "tag",
+    "val": "a",
+  },
+  Object {
+    "col": 2,
+    "line": 14,
+    "type": "class",
+    "val": "3foo",
+  },
+  Object {
+    "col": 1,
+    "line": 15,
+    "type": "newline",
+  },
+  Object {
+    "col": 1,
+    "line": 15,
     "type": "eos",
   },
 ]
@@ -10689,7 +10723,7 @@ Object {
   "code": "PUG:INVALID_CLASS_NAME",
   "column": 1,
   "line": 1,
-  "msg": "Class names must begin with \"-\", \"_\" or a letter.",
+  "msg": "Class names must contain at least one letter or underscore.",
 }
 `;
 
@@ -10698,7 +10732,7 @@ Object {
   "code": "PUG:INVALID_CLASS_NAME",
   "column": 1,
   "line": 1,
-  "msg": "If a class name begins with a \"-\" or \"--\", it must be followed by a letter or underscore.",
+  "msg": "Class names must contain at least one letter or underscore.",
 }
 `;
 
@@ -10707,7 +10741,7 @@ Object {
   "code": "PUG:INVALID_CLASS_NAME",
   "column": 1,
   "line": 1,
-  "msg": "\"ä\" is not a valid class name.  Class names must begin with \"-\", \"_\" or a letter and can only contain \"_\", \"-\", a-z and 0-9.",
+  "msg": "\"ä\" is not a valid class name.  Class names can only contain \"_\", \"-\", a-z and 0-9, and must contain at least one of \"_\", or a-z",
 }
 `;
 
diff --git a/packages/pug-lexer/test/cases/classes.pug b/packages/pug-lexer/test/cases/classes.pug
index 67e1a1bc5..699a07586 100644
--- a/packages/pug-lexer/test/cases/classes.pug
+++ b/packages/pug-lexer/test/cases/classes.pug
@@ -9,3 +9,6 @@ a.foo(class='bar').baz
 a.foo-bar_baz
 
 a(class={foo: true, bar: false, baz: true})
+
+a.-foo
+a.3foo

From d86ac52be4ec354cd6078797a80030ce3dc9e205 Mon Sep 17 00:00:00 2001
From: kakulukia <andy@freilandkiwis.de>
Date: Mon, 5 Feb 2018 11:39:55 +0100
Subject: [PATCH 35/96] new maintainer for pypugjs (#2947)

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83e2700b6..0162a49d1 100644
--- a/README.md
+++ b/README.md
@@ -148,12 +148,13 @@ Ports with very close syntax, adapted to other languages:
 
   - [PHP](https://github.com/pug-php/pug)
   - [Java](https://github.com/neuland/jade4j)
-  - [Python](https://github.com/matannoam/pypugjs)
+  - [Python](https://github.com/kakulukia/pypugjs)
   - [Ruby](https://github.com/yivo/pug-ruby)
   - [C# (ASP.NET Core)](https://github.com/AspNetMonsters/pugzor)
 
 ### Equivalents in other languages
 
+
 Templates engines available in other languages with a different syntax but a similar philosophy:
 
   - [Scaml for Scala](https://scalate.github.io/scalate/documentation/scaml-reference.html)

From 6f38adf280242be79df276a9d998505c3bbab79a Mon Sep 17 00:00:00 2001
From: void <6258960+ctrlaltdev@users.noreply.github.com>
Date: Tue, 6 Feb 2018 11:47:44 +0100
Subject: [PATCH 36/96] Add in additional resources of 2 packages (#2945)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0162a49d1..2e857c614 100644
--- a/README.md
+++ b/README.md
@@ -187,7 +187,7 @@ Embedded view engines for frameworks:
   - [Coda/SubEtha syntax Mode](https://github.com/aaronmccall/jade.mode)
   - [html2pug](https://github.com/donpark/html2jade) converter
   - [pug2php](https://github.com/SE7ENSKY/jade2php) converter
-  - [Pug Server](https://github.com/ded/jade-server)  Ideal for building local prototypes apart from any application
+  - [Pug Server](https://github.com/ctrlaltdev/pug-server) Ideal for building local prototypes apart from any application
   - [cache-pug-templates](https://github.com/ladjs/cache-pug-templates) Cache Pug templates for [Lad](https://github.com/ladjs/lad)/[Koa](https://github.com/koajs/koa)/[Express](https://github.com/expressjs/express)/[Connect](https://github.com/senchalabs/connect) with [Redis](https://redis.io/)
 
 

From eedf9a3125aaea179dce36468401ef3bfc3db102 Mon Sep 17 00:00:00 2001
From: Eugene Zhlobo <ezhlobo@gmail.com>
Date: Mon, 12 Feb 2018 13:13:25 +0300
Subject: [PATCH 37/96] Don't ask escaping for boolean attributes at the
 beginning of attributes-list (#2956)

* Update tests: Don't ask escaping for the first boolean attribute

* Don't ask escaping for the first attribute w/o value
---
 packages/pug-lexer/index.js                   |  2 +-
 .../test/__snapshots__/index.test.js.snap     | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index 73114efea..c4f3db5c3 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -1019,7 +1019,7 @@ Lexer.prototype = {
       var whitespaceRe = /[ \n\t]/;
       var quoteRe = /['"]/;
 
-      var escapedAttr = true
+      var escapedAttr = false
       var key = '';
       var val = '';
       var state = characterParser.defaultState();
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index 527b5da6b..368020744 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -634,7 +634,7 @@ Array [
   Object {
     "col": 3,
     "line": 3,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "foo",
     "type": "attribute",
     "val": true,
@@ -808,7 +808,7 @@ Array [
   Object {
     "col": 10,
     "line": 8,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "selected",
     "type": "attribute",
     "val": true,
@@ -985,7 +985,7 @@ Array [
   Object {
     "col": 3,
     "line": 14,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "foo",
     "type": "attribute",
     "val": true,
@@ -1159,7 +1159,7 @@ Array [
   Object {
     "col": 10,
     "line": 19,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "selected",
     "type": "attribute",
     "val": true,
@@ -1318,7 +1318,7 @@ Array [
   Object {
     "col": 5,
     "line": 25,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "abc",
     "type": "attribute",
     "val": true,
@@ -1355,7 +1355,7 @@ Array [
   Object {
     "col": 5,
     "line": 27,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "abc",
     "type": "attribute",
     "val": true,
@@ -1392,7 +1392,7 @@ Array [
   Object {
     "col": 5,
     "line": 29,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "abc",
     "type": "attribute",
     "val": true,
@@ -1429,7 +1429,7 @@ Array [
   Object {
     "col": 5,
     "line": 31,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "abc",
     "type": "attribute",
     "val": true,
@@ -1466,7 +1466,7 @@ Array [
   Object {
     "col": 5,
     "line": 33,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "abc",
     "type": "attribute",
     "val": true,
@@ -1503,7 +1503,7 @@ Array [
   Object {
     "col": 5,
     "line": 35,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "abc",
     "type": "attribute",
     "val": true,
@@ -16354,7 +16354,7 @@ Array [
   Object {
     "col": 21,
     "line": 7,
-    "mustEscape": true,
+    "mustEscape": false,
     "name": "something",
     "type": "attribute",
     "val": true,

From dd27b8bc2b5a57717a30857b5a2e762c759331d8 Mon Sep 17 00:00:00 2001
From: Eugene Zhlobo <ezhlobo@gmail.com>
Date: Mon, 12 Feb 2018 13:38:41 +0300
Subject: [PATCH 38/96] Add package-lock.json to .gitignore (#2955)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 54a9acd06..353261164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ npm-debug.log
 **/test/temp
 .release.json
 lerna-debug.log
+package-lock.json

From 3750dfef23b42ebd71b0d8b03e649b1bf339bc77 Mon Sep 17 00:00:00 2001
From: Eugene Zhlobo <ezhlobo@gmail.com>
Date: Tue, 13 Feb 2018 20:49:52 +0300
Subject: [PATCH 39/96] Ignore yarn.lock file (#2959)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 353261164..e2e102653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ npm-debug.log
 .release.json
 lerna-debug.log
 package-lock.json
+yarn.lock

From 8248ba89415809d2497ee2f279675793aef20ae2 Mon Sep 17 00:00:00 2001
From: Joshua Sullivan <joshuasulli@gmail.com>
Date: Thu, 15 Feb 2018 07:25:44 -0800
Subject: [PATCH 40/96] pug-lexer `loc` with source endings (#2957)

* Ignore VSCode files

* Use `loc` on lexer tokens to store source location information

* Update pug-parser and pug to use new `loc` attribute on tokens

* Update parser test cases to have new `loc` attribute on tokens

* New lexer snapshots

* New parser snapshots

* PR review changes
- remove no-ops
- rename `attributeName` to `attribute`
- attributeName no longer takes a tok and returns a reponse object
- minor cleanup
---
 .gitignore                                    |     1 +
 packages/pug-lexer/index.js                   |   536 +-
 .../test/__snapshots__/index.test.js.snap     | 43487 +++++++++++++---
 packages/pug-parser/index.js                  |   196 +-
 .../test/__snapshots__/index.test.js.snap     |   472 +-
 .../test/cases/attr-es2015.tokens.json        |    18 +-
 .../test/cases/attrs-data.tokens.json         |    66 +-
 .../test/cases/attrs.js.tokens.json           |   156 +-
 .../pug-parser/test/cases/attrs.tokens.json   |   360 +-
 .../test/cases/attrs.unescaped.tokens.json    |    30 +-
 .../pug-parser/test/cases/basic.tokens.json   |    18 +-
 .../pug-parser/test/cases/blanks.tokens.json  |    26 +-
 .../test/cases/block-code.tokens.json         |    56 +-
 .../block-expansion.shorthands.tokens.json    |    22 +-
 .../test/cases/block-expansion.tokens.json    |    42 +-
 .../test/cases/blockquote.tokens.json         |    20 +-
 .../test/cases/blocks-in-blocks.tokens.json   |    18 +-
 .../test/cases/blocks-in-if.tokens.json       |    88 +-
 .../test/cases/case-blocks.tokens.json        |    58 +-
 .../pug-parser/test/cases/case.tokens.json    |   108 +-
 .../test/cases/classes-empty.tokens.json      |    30 +-
 .../pug-parser/test/cases/classes.tokens.json |    48 +-
 .../test/cases/code.conditionals.tokens.json  |   172 +-
 .../test/cases/code.escape.tokens.json        |    12 +-
 .../test/cases/code.iteration.tokens.json     |   142 +-
 .../pug-parser/test/cases/code.tokens.json    |    80 +-
 .../test/cases/comments-in-case.tokens.json   |    52 +-
 .../test/cases/comments.source.tokens.json    |    36 +-
 .../test/cases/comments.tokens.json           |   122 +-
 .../test/cases/doctype.custom.tokens.json     |     4 +-
 .../test/cases/doctype.default.tokens.json    |    22 +-
 .../test/cases/doctype.keyword.tokens.json    |     4 +-
 .../test/cases/each.else.tokens.json          |   176 +-
 .../test/cases/escape-chars.tokens.json       |    12 +-
 .../test/cases/escape-test.tokens.json        |    40 +-
 .../escaping-class-attribute.tokens.json      |    62 +-
 .../test/cases/filter-in-include.tokens.json  |     8 +-
 .../test/cases/filters-empty.tokens.json      |    32 +-
 .../cases/filters.coffeescript.tokens.json    |    42 +-
 .../test/cases/filters.custom.tokens.json     |    42 +-
 .../cases/filters.include.custom.tokens.json  |    34 +-
 .../test/cases/filters.include.tokens.json    |    60 +-
 .../test/cases/filters.inline.tokens.json     |    16 +-
 .../test/cases/filters.less.tokens.json       |    46 +-
 .../test/cases/filters.markdown.tokens.json   |    26 +-
 .../test/cases/filters.nested.tokens.json     |    52 +-
 .../test/cases/filters.stylus.tokens.json     |    40 +-
 .../test/cases/filters.verbatim.tokens.json   |    13 +
 .../pug-parser/test/cases/html.tokens.json    |    52 +-
 .../pug-parser/test/cases/html5.tokens.json   |    40 +-
 .../include-extends-from-root.tokens.json     |     8 +-
 ...ude-extends-of-common-template.tokens.json |    14 +-
 .../include-extends-relative.tokens.json      |     8 +-
 .../cases/include-only-text-body.tokens.json  |    14 +-
 .../test/cases/include-only-text.tokens.json  |    32 +-
 .../cases/include-with-text-head.tokens.json  |    24 +-
 .../test/cases/include-with-text.tokens.json  |    34 +-
 .../test/cases/include.script.tokens.json     |    20 +-
 .../cases/include.yield.nested.tokens.json    |    22 +-
 .../cases/includes-with-ext-js.tokens.json    |    18 +-
 .../test/cases/includes.tokens.json           |    50 +-
 .../inheritance.alert-dialog.tokens.json      |    26 +-
 .../cases/inheritance.defaults.tokens.json    |    48 +-
 .../inheritance.extend.include.tokens.json    |    56 +-
 ...nheritance.extend.mixins.block.tokens.json |    18 +-
 .../inheritance.extend.mixins.tokens.json     |    44 +-
 .../inheritance.extend.recursive.tokens.json  |    18 +-
 .../test/cases/inheritance.extend.tokens.json |    40 +-
 .../inheritance.extend.whitespace.tokens.json |    40 +-
 .../test/cases/inheritance.tokens.json        |    40 +-
 .../cases/inline-block-comment.tokens.json    |    20 +-
 .../test/cases/inline-tag.tokens.json         |   154 +-
 .../cases/intepolated-elements.tokens.json    |    76 +-
 .../test/cases/interpolated-mixin.tokens.json |    30 +-
 .../cases/interpolation.escape.tokens.json    |    30 +-
 .../test/cases/layout.append.tokens.json      |    34 +-
 .../layout.append.without-block.tokens.json   |    34 +-
 ...out.multi.append.prepend.block.tokens.json |    92 +-
 .../test/cases/layout.prepend.tokens.json     |    34 +-
 .../layout.prepend.without-block.tokens.json  |    34 +-
 .../cases/mixin-at-end-of-file.tokens.json    |    18 +-
 .../cases/mixin-block-with-space.tokens.json  |    24 +-
 .../test/cases/mixin-hoist.tokens.json        |    28 +-
 .../test/cases/mixin-via-include.tokens.json  |    14 +-
 .../test/cases/mixin.attrs.tokens.json        |   322 +-
 .../mixin.block-tag-behaviour.tokens.json     |   112 +-
 .../test/cases/mixin.blocks.tokens.json       |   216 +-
 .../test/cases/mixin.merge.tokens.json        |   116 +-
 .../test/cases/mixins-unused.tokens.json      |    14 +-
 .../test/cases/mixins.rest-args.tokens.json   |    28 +-
 .../pug-parser/test/cases/mixins.tokens.json  |   130 +-
 .../test/cases/namespaces.tokens.json         |    16 +-
 .../pug-parser/test/cases/nesting.tokens.json |    46 +-
 .../test/cases/pipeless-comments.tokens.json  |    18 +-
 .../test/cases/pipeless-filters.tokens.json   |    18 +-
 .../test/cases/pipeless-tag.tokens.json       |    28 +-
 .../pug-parser/test/cases/pre.tokens.json     |    50 +-
 .../pug-parser/test/cases/quotes.tokens.json  |    12 +-
 .../test/cases/regression.1794.tokens.json    |    18 +-
 .../test/cases/regression.784.tokens.json     |    10 +-
 .../test/cases/script.whitespace.tokens.json  |    28 +-
 .../test/cases/scripts.non-js.tokens.json     |    58 +-
 .../pug-parser/test/cases/scripts.tokens.json |    40 +-
 .../test/cases/self-closing-html.tokens.json  |    22 +-
 .../test/cases/single-period.tokens.json      |     6 +-
 .../pug-parser/test/cases/source.tokens.json  |    42 +-
 .../pug-parser/test/cases/styles.tokens.json  |   128 +-
 .../test/cases/tag-blocks.tokens.json         |    32 +-
 .../test/cases/tag.interpolation.tokens.json  |   132 +-
 .../test/cases/tags.self-closing.tokens.json  |   120 +-
 .../test/cases/template.tokens.json           |    54 +-
 .../test/cases/text-block.tokens.json         |    40 +-
 .../pug-parser/test/cases/text.tokens.json    |   182 +-
 .../pug-parser/test/cases/utf8bom.tokens.json |     8 +-
 .../pug-parser/test/cases/vars.tokens.json    |    20 +-
 .../pug-parser/test/cases/while.tokens.json   |    26 +-
 .../pug-parser/test/cases/xml.tokens.json     |    22 +-
 .../yield-before-conditional-head.tokens.json |    36 +-
 .../yield-before-conditional.tokens.json      |    40 +-
 .../test/cases/yield-head.tokens.json         |    30 +-
 .../test/cases/yield-title-head.tokens.json   |    34 +-
 .../test/cases/yield-title.tokens.json        |    24 +-
 .../pug-parser/test/cases/yield.tokens.json   |    40 +-
 packages/pug/lib/index.js                     |     3 +-
 124 files changed, 39452 insertions(+), 11360 deletions(-)
 create mode 100644 packages/pug-parser/test/cases/filters.verbatim.tokens.json

diff --git a/.gitignore b/.gitignore
index e2e102653..09cffd2c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .idea
+.vscode
 testing
 node_modules
 lib-cov
diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index c4f3db5c3..434e3a048 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -41,6 +41,7 @@ function Lexer(str, options) {
   this.indentRe = null;
   // If #{}, !{} or #[] syntax is allowed when adding text
   this.interpolationAllowed = true;
+  this.whitespaceRe = /[ \n\t]/;
 
   this.tokens = [];
   this.ended = false;
@@ -106,12 +107,37 @@ Lexer.prototype = {
    */
 
   tok: function(type, val){
-    var res = {type: type, line: this.lineno, col: this.colno};
+    var res = {
+      type: type, 
+      loc: {
+        start: {
+          line: this.lineno, 
+          column: this.colno
+        },
+        filename: this.filename
+      }
+    };
 
     if (val !== undefined) res.val = val;
 
     return res;
   },
+  
+  /**
+   * Set the token's `loc.end` value.
+   * 
+   * @param {Object} tok
+   * @returns {Object}
+   * @api private
+   */
+  
+  tokEnd: function(tok){
+    tok.loc.end = {
+      line: this.lineno,
+      column: this.colno
+    };
+    return tok;
+  },
 
   /**
    * Increment `this.lineno` and reset `this.colno`.
@@ -275,9 +301,9 @@ Lexer.prototype = {
       this.error('NO_END_BRACKET', 'End of line was reached with no closing bracket for interpolation.');
     }
     for (var i = 0; this.indentStack[i]; i++) {
-      this.tokens.push(this.tok('outdent'));
+      this.tokens.push(this.tokEnd(this.tok('outdent')));
     }
-    this.tokens.push(this.tok('eos'));
+    this.tokens.push(this.tokEnd(this.tok('eos')));
     this.ended = true;
     return true;
   },
@@ -308,6 +334,7 @@ Lexer.prototype = {
       this.interpolationAllowed = tok.buffer;
       this.tokens.push(tok);
       this.incrementColumn(captures[0].length);
+      this.tokEnd(tok);
       this.callLexerFunction('pipelessText');
       return true;
     }
@@ -330,6 +357,7 @@ Lexer.prototype = {
       var lines = splitted.length - 1;
       this.incrementLine(lines);
       this.incrementColumn(splitted[lines].length + 1); // + 1 → '}'
+      this.tokEnd(tok);
       return true;
     }
   },
@@ -347,6 +375,7 @@ Lexer.prototype = {
       tok = this.tok('tag', name);
       this.tokens.push(tok);
       this.incrementColumn(len);
+      this.tokEnd(tok);
       return true;
     }
   },
@@ -361,6 +390,7 @@ Lexer.prototype = {
     if (tok) {
       this.tokens.push(tok);
       this.incrementColumn(tok.val.length);
+      this.tokEnd(tok);
       this.callLexerFunction('attrs');
       if (!inInclude) {
         this.interpolationAllowed = false;
@@ -377,7 +407,7 @@ Lexer.prototype = {
   doctype: function() {
     var node = this.scanEndOfLine(/^doctype *([^\n]*)/, 'doctype');
     if (node) {
-      this.tokens.push(node);
+      this.tokens.push(this.tokEnd(node));
       return true;
     }
   },
@@ -391,6 +421,7 @@ Lexer.prototype = {
     if (tok) {
       this.tokens.push(tok);
       this.incrementColumn(tok.val.length);
+      this.tokEnd(tok);
       return true;
     }
     if (/^#/.test(this.input)) {
@@ -407,6 +438,7 @@ Lexer.prototype = {
     if (tok) {
       this.tokens.push(tok);
       this.incrementColumn(tok.val.length);
+      this.tokEnd(tok);
       return true;
     }
     if (/^\.[_a-z0-9\-]+/i.test(this.input)) {
@@ -428,8 +460,10 @@ Lexer.prototype = {
     }
   },
   addText: function (type, value, prefix, escaped) {
+    var tok;
     if (value + prefix === '') return;
     prefix = prefix || '';
+    escaped = escaped || 0;
     var indexOfEnd = this.interpolated ? value.indexOf(']') : -1;
     var indexOfStart = this.interpolationAllowed ? value.indexOf('#[') : -1;
     var indexOfEscaped = this.interpolationAllowed ? value.indexOf('\\#[') : -1;
@@ -442,14 +476,15 @@ Lexer.prototype = {
 
     if (indexOfEscaped !== Infinity && indexOfEscaped < indexOfEnd && indexOfEscaped < indexOfStart && indexOfEscaped < indexOfStringInterp) {
       prefix = prefix + value.substring(0, indexOfEscaped) + '#[';
-      return this.addText(type, value.substring(indexOfEscaped + 3), prefix, true);
+      return this.addText(type, value.substring(indexOfEscaped + 3), prefix, escaped + 1);
     }
     if (indexOfStart !== Infinity && indexOfStart < indexOfEnd && indexOfStart < indexOfEscaped && indexOfStart < indexOfStringInterp) {
-      this.tokens.push(this.tok(type, prefix + value.substring(0, indexOfStart)));
-      this.incrementColumn(prefix.length + indexOfStart);
-      if (escaped) this.incrementColumn(1);
-      this.tokens.push(this.tok('start-pug-interpolation'));
+      tok = this.tok(type, prefix + value.substring(0, indexOfStart));
+      this.incrementColumn(prefix.length + indexOfStart + escaped);
+      this.tokens.push(this.tokEnd(tok));
+      tok = this.tok('start-pug-interpolation');
       this.incrementColumn(2);
+      this.tokens.push(this.tokEnd(tok));
       var child = new this.constructor(value.substr(indexOfStart + 2), {
         filename: this.filename,
         interpolated: true,
@@ -468,8 +503,9 @@ Lexer.prototype = {
       }
       this.colno = child.colno;
       this.tokens = this.tokens.concat(interpolated);
-      this.tokens.push(this.tok('end-pug-interpolation'));
+      tok = this.tok('end-pug-interpolation');
       this.incrementColumn(1);
+      this.tokens.push(this.tokEnd(tok));
       this.addText(type, child.input);
       return;
     }
@@ -484,18 +520,19 @@ Lexer.prototype = {
     if (indexOfStringInterp !== Infinity) {
       if (matchOfStringInterp[1]) {
         prefix = prefix + value.substring(0, indexOfStringInterp) + '#{';
-        return this.addText(type, value.substring(indexOfStringInterp + 3), prefix);
+        return this.addText(type, value.substring(indexOfStringInterp + 3), prefix, escaped + 1);
       }
       var before = value.substr(0, indexOfStringInterp);
       if (prefix || before) {
         before = prefix + before;
-        this.tokens.push(this.tok(type, before));
-        this.incrementColumn(before.length);
+        tok = this.tok(type, before);
+        this.incrementColumn(before.length + escaped);
+        this.tokens.push(this.tokEnd(tok));
       }
 
       var rest = matchOfStringInterp[3];
       var range;
-      var tok = this.tok('interpolated-code');
+      tok = this.tok('interpolated-code');
       this.incrementColumn(2);
       try {
         range = characterParser.parseUntil(rest, '}');
@@ -515,21 +552,23 @@ Lexer.prototype = {
       tok.buffer = true;
       tok.val = range.src;
       this.assertExpression(range.src);
-      this.tokens.push(tok);
 
       if (range.end + 1 < rest.length) {
         rest = rest.substr(range.end + 1);
         this.incrementColumn(range.end + 1);
+        this.tokens.push(this.tokEnd(tok));
         this.addText(type, rest);
       } else {
         this.incrementColumn(rest.length);
+        this.tokens.push(this.tokEnd(tok));
       }
       return;
     }
 
     value = prefix + value;
-    this.tokens.push(this.tok(type, value));
-    this.incrementColumn(value.length);
+    tok = this.tok(type, value);
+    this.incrementColumn(value.length + escaped);
+    this.tokens.push(this.tokEnd(tok));
   },
 
   text: function() {
@@ -557,7 +596,7 @@ Lexer.prototype = {
   dot: function() {
     var tok;
     if (tok = this.scanEndOfLine(/^\./, 'dot')) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       this.callLexerFunction('pipelessText');
       return true;
     }
@@ -570,7 +609,7 @@ Lexer.prototype = {
   "extends": function() {
     var tok = this.scan(/^extends?(?= |$|\n)/, 'extends');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       if (!this.callLexerFunction('path')) {
         this.error('NO_EXTENDS_PATH', 'missing path for extends');
       }
@@ -595,10 +634,14 @@ Lexer.prototype = {
         name = name.split('//')[0].trim();
       }
       if (!name) return;
-      this.consume(captures[0].length - comment.length);
       var tok = this.tok('block', name);
+      var len = captures[0].length - comment.length;
+      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      this.incrementColumn(len);
       tok.mode = 'prepend';
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
+      this.consume(captures[0].length - comment.length);
+      this.incrementColumn(captures[0].length - comment.length - len);
       return true;
     }
   },
@@ -617,10 +660,14 @@ Lexer.prototype = {
         name = name.split('//')[0].trim();
       }
       if (!name) return;
-      this.consume(captures[0].length - comment.length);
       var tok = this.tok('block', name);
+      var len = captures[0].length - comment.length;
+      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      this.incrementColumn(len);
       tok.mode = 'append';
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
+      this.consume(captures[0].length - comment.length);
+      this.incrementColumn(captures[0].length - comment.length - len);
       return true;
     }
   },
@@ -639,10 +686,14 @@ Lexer.prototype = {
         name = name.split('//')[0].trim();
       }
       if (!name) return;
-      this.consume(captures[0].length - comment.length);
       var tok = this.tok('block', name);
+      var len = captures[0].length - comment.length;
+      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      this.incrementColumn(len);
       tok.mode = 'replace';
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
+      this.consume(captures[0].length - comment.length);
+      this.incrementColumn(captures[0].length - comment.length - len);
       return true;
     }
   },
@@ -654,7 +705,7 @@ Lexer.prototype = {
   mixinBlock: function() {
     var tok;
     if (tok = this.scanEndOfLine(/^block/, 'mixin-block')) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -666,7 +717,7 @@ Lexer.prototype = {
   'yield': function() {
     var tok = this.scanEndOfLine(/^yield/, 'yield');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -678,7 +729,7 @@ Lexer.prototype = {
   include: function() {
     var tok = this.scan(/^include(?=:| |$|\n)/, 'include');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       while (this.callLexerFunction('filter', { inInclude: true }));
       if (!this.callLexerFunction('path')) {
         if (/^[^ \n]+/.test(this.input)) {
@@ -703,7 +754,7 @@ Lexer.prototype = {
   path: function() {
     var tok = this.scanEndOfLine(/^ ([^\n]+)/, 'path');
     if (tok && (tok.val = tok.val.trim())) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -718,7 +769,7 @@ Lexer.prototype = {
       this.incrementColumn(-tok.val.length);
       this.assertExpression(tok.val);
       this.incrementColumn(tok.val.length);
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^case\b/)) {
@@ -747,7 +798,7 @@ Lexer.prototype = {
       this.incrementColumn(-tok.val.length);
       this.assertExpression(tok.val);
       this.incrementColumn(tok.val.length);
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^when\b/)) {
@@ -762,7 +813,7 @@ Lexer.prototype = {
   "default": function() {
     var tok = this.scanEndOfLine(/^default/, 'default');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^default\b/)) {
@@ -813,7 +864,7 @@ Lexer.prototype = {
           }
         }
       }
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -828,7 +879,8 @@ Lexer.prototype = {
       this.consume(captures[0].length);
       var tok = this.tok('mixin', captures[1]);
       tok.args = captures[2] || null;
-      this.tokens.push(tok);
+      this.incrementColumn(captures[0].length);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -866,7 +918,8 @@ Lexer.prototype = {
           }
           break;
       }
-      this.tokens.push(tok);
+      this.incrementColumn(js.length);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -876,11 +929,13 @@ Lexer.prototype = {
    */
 
   "while": function() {
-    var captures;
+    var captures, tok;
     if (captures = /^while +([^\n]+)/.exec(this.input)) {
       this.consume(captures[0].length);
-      this.assertExpression(captures[1])
-      this.tokens.push(this.tok('while', captures[1]));
+      this.assertExpression(captures[1]);
+      tok = this.tok('while', captures[1]);
+      this.incrementColumn(captures[0].length);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^while\b/)) {
@@ -902,7 +957,7 @@ Lexer.prototype = {
       this.assertExpression(captures[3])
       tok.code = captures[3];
       this.incrementColumn(captures[3].length);
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^(?:each|for)\b/)) {
@@ -980,6 +1035,7 @@ Lexer.prototype = {
       //     ---            code
       //        ^           after colno
       this.incrementColumn(code.length);
+      this.tokEnd(tok);
       return true;
     }
   },
@@ -990,172 +1046,242 @@ Lexer.prototype = {
   blockCode: function() {
     var tok
     if (tok = this.scanEndOfLine(/^-/, 'blockcode')) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       this.interpolationAllowed = false;
       this.callLexerFunction('pipelessText');
       return true;
     }
   },
-
+  
   /**
-   * Attributes.
+   * Attribute Name.
    */
-
-  attrs: function() {
-    if ('(' == this.input.charAt(0)) {
-      var startingLine = this.lineno;
-      this.tokens.push(this.tok('start-attributes'));
-      var index = this.bracketExpression().end
-        , str = this.input.substr(1, index-1);
-
+  attribute: function(str){
+    var quote = '';
+    var quoteRe = /['"]/;
+    var key = '';
+    var i;
+    
+    // consume all whitespace before the key
+    for(i = 0; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) break;
+      if(str[i] === '\n'){
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    if(i === str.length){
+      return '';
+    }
+    
+    var tok = this.tok('attribute');
+    
+    // quote?
+    if(quoteRe.test(str[i])){
+      quote = str[i];
       this.incrementColumn(1);
-      this.assertNestingCorrect(str);
-
-      var quote = '';
-      var self = this;
-
-      this.consume(index + 1);
-
-      var whitespaceRe = /[ \n\t]/;
-      var quoteRe = /['"]/;
-
-      var escapedAttr = false
-      var key = '';
-      var val = '';
-      var state = characterParser.defaultState();
-      var lineno = startingLine;
-      var colnoBeginAttr = this.colno;
-      var colnoBeginVal;
-      var loc = 'key';
-      var isEndOfAttribute = function (i) {
-        // if the key is not started, then the attribute cannot be ended
-        if (key.trim() === '') {
-          colnoBeginAttr = this.colno;
-          return false;
+      i++;
+    }
+    
+    // start looping through the key
+    for (; i < str.length; i++) {
+      
+      if(quote){
+        if (str[i] === quote) {
+          this.incrementColumn(1);
+          i++;
+          break;
         }
-        // if there's nothing more then the attribute must be ended
-        if (i === str.length) return true;
-
-        if (loc === 'key') {
-          if (whitespaceRe.test(str[i])) {
-            // find the first non-whitespace character
-            for (var x = i; x < str.length; x++) {
-              if (!whitespaceRe.test(str[x])) {
-                // starts a `value`
-                if (str[x] === '=' || str[x] === '!') return false;
-                // will be handled when x === i
-                else if (str[x] === ',') return false;
-                // attribute ended
-                else return true;
+      } else {
+        if(this.whitespaceRe.test(str[i]) || str[i] === '!' || str[i] === '=' || str[i] === ',') {
+          break;
+        }
+      }
+      
+      key += str[i];
+        
+      if (str[i] === '\n') {
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    tok.name = key;
+    
+    var valueResponse = this.attributeValue(str.substr(i));
+    
+    if (valueResponse.val) {
+      tok.val = valueResponse.val;
+      tok.mustEscape = valueResponse.mustEscape;
+    } else {
+      // was a boolean attribute (ex: `input(disabled)`)
+      tok.val = true;
+      tok.mustEscape = true;
+    }
+    
+    str = valueResponse.remainingSource;
+    
+    this.tokens.push(this.tokEnd(tok));
+    
+    for(i = 0; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) {
+        break;
+      }
+      if(str[i] === '\n'){
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    if(str[i] === ','){
+      this.incrementColumn(1);
+      i++;
+    }
+    
+    return str.substr(i);
+  },
+  
+  /**
+   * Attribute Value.
+   */
+  attributeValue: function(str){
+    var quoteRe = /['"]/;
+    var val = '';
+    var done, i, x;
+    var escapeAttr = true;
+    var state = characterParser.defaultState();
+    var col = this.colno;
+    var line = this.lineno;
+    
+    // consume all whitespace before the equals sign
+    for(i = 0; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) break;
+      if(str[i] === '\n'){
+        line++;
+        col = 1;
+      } else {
+        col++;
+      }
+    }
+    
+    if(i === str.length){
+      return { remainingSource: str };
+    }
+    
+    if(str[i] === '!'){
+      escapeAttr = false;
+      col++;
+      i++;
+      if (str[i] !== '=') this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[i] + ' expected `=`');
+    }
+    
+    if(str[i] !== '='){
+      // check for anti-pattern `div("foo"bar)`
+      if (i === 0 && str && !this.whitespaceRe.test(str[0]) && str[0] !== ','){
+        this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[0] + ' expected `=`');
+      } else {
+        return { remainingSource: str };
+      }
+    }
+    
+    this.lineno = line;
+    this.colno = col + 1;
+    i++;
+    
+    // consume all whitespace before the value
+    for(; i < str.length; i++){
+      if(!this.whitespaceRe.test(str[i])) break;
+      if(str[i] === '\n'){
+        this.incrementLine(1);
+      } else {
+        this.incrementColumn(1);
+      }
+    }
+    
+    line = this.lineno;
+    col = this.colno;
+    
+    // start looping through the value
+    for (; i < str.length; i++) {
+      // if the character is in a string or in parentheses/brackets/braces
+      if (!(state.isNesting() || state.isString())){
+        
+        if (this.whitespaceRe.test(str[i])) {
+          done = false;
+          
+          // find the first non-whitespace character
+          for (x = i; x < str.length; x++) {
+            if (!this.whitespaceRe.test(str[x])) {
+              // if it is a JavaScript punctuator, then assume that it is
+              // a part of the value
+              if((!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x]) || str[x] === ':') && this.assertExpression(val, true)){
+                done = true;
               }
+              break;
             }
           }
-          // if there's no whitespace and the character is not ',', the
-          // attribute did not end.
-          return str[i] === ',';
-        } else if (loc === 'value') {
-          // if the character is in a string or in parentheses/brackets/braces
-          if (state.isNesting() || state.isString()) return false;
-
-          // if the current value expression is not valid JavaScript, then
-          // assume that the user did not end the value.  To enforce this,
-          // we call `self.assertExpression(val, true)`, but since the other
-          // tests are much faster, we run the other tests first.
-
-          if (whitespaceRe.test(str[i])) {
-            // find the first non-whitespace character
-            for (var x = i; x < str.length; x++) {
-              if (!whitespaceRe.test(str[x])) {
-                // if it is a JavaScript punctuator, then assume that it is
-                // a part of the value
-                return (!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x]) || str[x] === ':') && self.assertExpression(val, true);
-              }
-            }
+          
+          // if everything else is whitespace, return now so last attribute
+          // does not include trailing whitespace
+          if(done || x === str.length){
+            break;
           }
-          // if there's no whitespace and the character is not ',', the
-          // attribute did not end.
-          return str[i] === ',' && self.assertExpression(val, true);
+        }
+        
+        // if there's no whitespace and the character is not ',', the
+        // attribute did not end.
+        if(str[i] === ',' && this.assertExpression(val, true)){
+          break;
         }
       }
+      
+      state = characterParser.parseChar(str[i], state);
+      val += str[i];
+      
+      if (str[i] === '\n') {
+        line++;
+        col = 1;
+      } else {
+        col++;
+      }
+    }
+    
+    this.assertExpression(val);
+    
+    this.lineno = line;
+    this.colno = col;
+    
+    return { val: val, mustEscape: escapeAttr, remainingSource: str.substr(i) };
+  },
 
-      for (var i = 0; i <= str.length; i++) {
-        if (isEndOfAttribute.call(this, i)) {
-          if (val.trim()) {
-            var saved = this.colno;
-            this.colno = colnoBeginVal;
-            this.assertExpression(val);
-            this.colno = saved;
-          }
-
-          val = val.trim();
-
-          key = key.trim();
-          key = key.replace(/^['"]|['"]$/g, '');
+  /**
+   * Attributes.
+   */
+  
+  attrs: function() {
+    var tok;
+    
+    if ('(' == this.input.charAt(0)) {
+      tok = this.tok('start-attributes');
+      var index = this.bracketExpression().end;
+      var str = this.input.substr(1, index-1);
 
-          var tok = this.tok('attribute');
-          tok.name = key;
-          tok.val = '' == val ? true : val;
-          tok.col = colnoBeginAttr;
-          tok.mustEscape = escapedAttr;
-          this.tokens.push(tok);
+      this.incrementColumn(1);
+      this.tokens.push(this.tokEnd(tok));
+      this.assertNestingCorrect(str);
+      this.consume(index + 1);
 
-          key = val = '';
-          loc = 'key';
-          escapedAttr = false;
-          this.lineno = lineno;
-        } else {
-          switch (loc) {
-            case 'key-char':
-              if (str[i] === quote) {
-                loc = 'key';
-                if (i + 1 < str.length && !/[ ,!=\n\t]/.test(str[i + 1]))
-                  this.error('INVALID_KEY_CHARACTER', 'Unexpected character "' + str[i + 1] + '" expected ` `, `\\n`, `\t`, `,`, `!` or `=`');
-              } else {
-                key += str[i];
-              }
-              break;
-            case 'key':
-              if (key === '' && quoteRe.test(str[i])) {
-                loc = 'key-char';
-                quote = str[i];
-              } else if (str[i] === '!' || str[i] === '=') {
-                escapedAttr = str[i] !== '!';
-                if (str[i] === '!') {
-                  this.incrementColumn(1);
-                  i++;
-                }
-                if (str[i] !== '=') this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[i] + ' expected `=`');
-                loc = 'value';
-                colnoBeginVal = this.colno + 1;
-                state = characterParser.defaultState();
-              } else {
-                key += str[i]
-              }
-              break;
-            case 'value':
-              state = characterParser.parseChar(str[i], state);
-              val += str[i];
-              break;
-          }
-        }
-        if (str[i] === '\n') {
-          // Save the line number locally to keep this.lineno at the start of
-          // the attribute.
-          lineno++;
-          this.colno = 1;
-          // If the key has not been started, update this.lineno immediately.
-          if (!key.trim()) this.lineno = lineno;
-        } else if (str[i] !== undefined) {
-          this.incrementColumn(1);
-        }
+      while(str){
+        str = this.attribute(str);
       }
 
-      // Reset the line numbers based on the line started on
-      // plus the number of newline characters encountered
-      this.lineno = startingLine + (str.match(/\n/g) || []).length;
-
-      this.tokens.push(this.tok('end-attributes'));
+      tok = this.tok('end-attributes');
       this.incrementColumn(1);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -1173,8 +1299,8 @@ Lexer.prototype = {
       consumed = args.end + 1;
       this.consume(consumed);
       tok.val = args.src;
-      this.tokens.push(tok);
       this.incrementColumn(consumed);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -1185,6 +1311,7 @@ Lexer.prototype = {
 
   indent: function() {
     var captures = this.scanIndentation();
+    var tok;
 
     if (captures) {
       var indents = captures[1].length;
@@ -1199,28 +1326,36 @@ Lexer.prototype = {
       // blank line
       if ('\n' == this.input[0]) {
         this.interpolationAllowed = true;
-        return this.tok('newline');
+        return this.tokEnd(this.tok('newline'));
       }
 
       // outdent
       if (indents < this.indentStack[0]) {
+        var outdent_count = 0;
         while (this.indentStack[0] > indents) {
           if (this.indentStack[1] < indents) {
             this.error('INCONSISTENT_INDENTATION', 'Inconsistent indentation. Expecting either ' + this.indentStack[1] + ' or ' + this.indentStack[0] + ' spaces/tabs.');
           }
-          this.colno = this.indentStack[1] + 1;
-          this.tokens.push(this.tok('outdent'));
+          outdent_count++;
           this.indentStack.shift();
         }
+        while(outdent_count--){
+          this.colno = 1;
+          tok = this.tok('outdent');
+          this.colno = this.indentStack[0] + 1;
+          this.tokens.push(this.tokEnd(tok));
+        }
       // indent
       } else if (indents && indents != this.indentStack[0]) {
-        this.tokens.push(this.tok('indent', indents));
+        tok = this.tok('indent', indents);
         this.colno = 1 + indents;
+        this.tokens.push(this.tokEnd(tok));
         this.indentStack.unshift(indents);
       // newline
       } else {
-        this.tokens.push(this.tok('newline'));
-        this.colno = 1 + (this.indentStack[0] || 0);
+        tok = this.tok('newline');
+        this.colno = 1 + Math.min(this.indentStack[0] || 0, indents);
+        this.tokens.push(this.tokEnd(tok));
       }
 
       this.interpolationAllowed = true;
@@ -1235,8 +1370,9 @@ Lexer.prototype = {
 
     indents = indents || captures && captures[1].length;
     if (indents > this.indentStack[0]) {
-      this.tokens.push(this.tok('start-pipeless-text'));
+      this.tokens.push(this.tokEnd(this.tok('start-pipeless-text')));
       var tokens = [];
+      var token_indent = [];
       var isMatch;
       // Index in this.input. Can't use this.consume because we might need to
       // retry lexing the block.
@@ -1248,7 +1384,9 @@ Lexer.prototype = {
         var str = this.input.substr(stringPtr + 1, i);
         var lineCaptures = this.indentRe.exec('\n' + str);
         var lineIndents = lineCaptures && lineCaptures[1].length;
-        isMatch = lineIndents >= indents || !str.trim();
+        isMatch = lineIndents >= indents;
+        token_indent.push(isMatch);
+        isMatch = isMatch || !str.trim();
         if (isMatch) {
           // consume test along with `\n` prefix if match
           stringPtr += str.length + 1;
@@ -1263,12 +1401,14 @@ Lexer.prototype = {
       this.consume(stringPtr);
       while (this.input.length === 0 && tokens[tokens.length - 1] === '') tokens.pop();
       tokens.forEach(function (token, i) {
+        var tok;
         this.incrementLine(1);
-        if (i !== 0) this.tokens.push(this.tok('newline'));
-        this.incrementColumn(indents);
+        if (i !== 0) tok = this.tok('newline');
+        if (token_indent[i]) this.incrementColumn(indents);
+        if (tok) this.tokens.push(this.tokEnd(tok));
         this.addText('text', token);
       }.bind(this));
-      this.tokens.push(this.tok('end-pipeless-text'));
+      this.tokens.push(this.tokEnd(this.tok('end-pipeless-text')));
       return true;
     }
   },
@@ -1280,7 +1420,7 @@ Lexer.prototype = {
   slash: function() {
     var tok = this.scan(/^\//, 'slash');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
@@ -1292,7 +1432,7 @@ Lexer.prototype = {
   colon: function() {
     var tok = this.scan(/^: +/, ':');
     if (tok) {
-      this.tokens.push(tok);
+      this.tokens.push(this.tokEnd(tok));
       return true;
     }
   },
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index 368020744..0484b309b 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -2,55 +2,136 @@ exports[`test attr-es2015.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 50,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var avatar = \'219b77f9d21de75e81851b6b886057c7\'",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "avatar-div",
   },
   Object {
-    "col": 15,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 15,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 88,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "\`background-image: url(https://www.gravatar.com/avatar/\${avatar})\`",
   },
   Object {
-    "col": 88,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 89,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 88,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attr-es2015.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -69,474 +150,1176 @@ exports[`test attrs.js.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var id = 5",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "function answer() { return 42; }",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 37,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 37,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 27,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 27,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 45,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 45,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "meta",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "key",
     "type": "attribute",
     "val": "\'answer\'",
   },
   Object {
-    "col": 20,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 20,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "answer()",
   },
   Object {
-    "col": 34,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 34,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 31,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "tag-class",
   },
   Object {
-    "col": 12,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 12,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 41,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 41,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 36,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 36,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/user/\' + id",
   },
   Object {
-    "col": 26,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 26,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'button\'",
   },
   Object {
-    "col": 44,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 44,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "meta",
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 6,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 6,
+        "line": 11,
+      },
+    },
     "mustEscape": true,
     "name": "key",
     "type": "attribute",
     "val": "\'answer\'",
   },
   Object {
-    "col": 19,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 19,
+        "line": 11,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "answer()",
   },
   Object {
-    "col": 33,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 33,
+        "line": 11,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 31,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 31,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "tag-class",
   },
   Object {
-    "col": 12,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 12,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 41,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 41,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "id",
   },
   Object {
-    "col": 10,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 10,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 11,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 11,
+        "line": 15,
+      },
+    },
     "type": "&attributes",
     "val": "{foo: \'bar\'}",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var bar = null",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 17,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "null",
   },
   Object {
-    "col": 14,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 14,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "bar",
   },
   Object {
-    "col": 21,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 17,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 17,
+      },
+    },
     "type": "&attributes",
     "val": "{baz: \'baz\'}",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -545,1094 +1328,2714 @@ Array [
 exports[`test attrs.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/contact\'",
   },
   Object {
-    "col": 18,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 20,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 20,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "contact",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/save\'",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 16,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "button",
   },
   Object {
-    "col": 24,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "save",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
+    "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 3,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
+    "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 13,
-    "line": 3,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
+    "mustEscape": true,
     "name": "baz",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo, bar, baz\'",
   },
   Object {
-    "col": 24,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "1",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'((foo))\'",
   },
   Object {
-    "col": 18,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "(1) ? 1 : 0",
   },
   Object {
-    "col": 35,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 35,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "select",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 23,
-    "line": 7,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 23,
+        "line": 7,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 31,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "Foo",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 8,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 20,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 20,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 31,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Bar",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\"class:\"",
   },
   Object {
-    "col": 15,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "pattern",
     "type": "attribute",
     "val": "\'\\\\S+\'",
   },
   Object {
-    "col": 21,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/contact\'",
   },
   Object {
-    "col": 18,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 20,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 20,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "contact",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/save\'",
   },
   Object {
-    "col": 15,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 16,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "button",
   },
   Object {
-    "col": 24,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "save",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 14,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 14,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
+    "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 7,
-    "line": 14,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 14,
+      },
+    },
+    "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 11,
-    "line": 14,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 11,
+        "line": 14,
+      },
+    },
+    "mustEscape": true,
     "name": "baz",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 14,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 14,
+        "line": 14,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo, bar, baz\'",
   },
   Object {
-    "col": 23,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 23,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "1",
   },
   Object {
-    "col": 28,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 28,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 16,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'((foo))\'",
   },
   Object {
-    "col": 17,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 17,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "(1) ? 1 : 0",
   },
   Object {
-    "col": 34,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 34,
+        "line": 16,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "select",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 18,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 22,
-    "line": 18,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 22,
+        "line": 18,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 30,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 18,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 32,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "Foo",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 9,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 19,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 19,
+      },
+    },
+    "mustEscape": true,
     "name": "selected",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 19,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 19,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 30,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 32,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "Bar",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 20,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\"class:\"",
   },
   Object {
-    "col": 15,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 20,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 21,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 21,
+      },
+    },
     "mustEscape": true,
     "name": "pattern",
     "type": "attribute",
     "val": "\'\\\\S+\'",
   },
   Object {
-    "col": 21,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 21,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 22,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 22,
+      },
+    },
     "mustEscape": true,
     "name": "terse",
     "type": "attribute",
     "val": "\"true\"",
   },
   Object {
-    "col": 17,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 17,
+        "line": 22,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 23,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 23,
+      },
+    },
     "mustEscape": true,
     "name": "date",
     "type": "attribute",
     "val": "new Date(0)",
   },
   Object {
-    "col": 21,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 23,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 25,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 25,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 25,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 5,
-    "line": 26,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 26,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 26,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 27,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 27,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 27,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 27,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 5,
-    "line": 28,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 28,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 28,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 29,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 29,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 29,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 29,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 3,
-    "line": 30,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 30,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 6,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 30,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 31,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 31,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 31,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 31,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 4,
-    "line": 32,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 32,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 7,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 32,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 33,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 33,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 33,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 3,
-    "line": 34,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 34,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 6,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 34,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 35,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 35,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 35,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 35,
+      },
+    },
+    "mustEscape": true,
     "name": "abc",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 5,
-    "line": 36,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
+    "mustEscape": true,
     "name": "def",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 8,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 8,
+        "line": 36,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var attrs = {foo: \'bar\', bar: \'<baz>\'}",
   },
   Object {
-    "col": 1,
-    "line": 40,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 40,
+      },
+    },
     "type": "&attributes",
     "val": "attrs",
   },
   Object {
-    "col": 1,
-    "line": 42,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 42,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 42,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 14,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 42,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\"bar\"",
   },
   Object {
-    "col": 24,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 42,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 43,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 2,
+        "line": 43,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 43,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 14,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 43,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 24,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 24,
+        "line": 43,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 44,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1641,90 +4044,225 @@ Array [
 exports[`test attrs.unescaped.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "name": "id",
     "type": "attribute",
     "val": "\'user-<%= user.id %>\'",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "<%= user.title %>",
   },
   Object {
-    "col": 25,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.unescaped.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1734,194 +4272,491 @@ exports[`test attrs-data.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = { name: \'tobi\' }",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "data-user",
     "type": "attribute",
     "val": "user",
   },
   Object {
-    "col": 19,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 19,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "data-items",
     "type": "attribute",
     "val": "[1,2,3]",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "data-username",
     "type": "attribute",
     "val": "\'tobi\'",
   },
   Object {
-    "col": 25,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 25,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "data-escaped",
     "type": "attribute",
     "val": "{message: \"Let\'s rock!\"}",
   },
   Object {
-    "col": 42,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 42,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "data-ampersand",
     "type": "attribute",
     "val": "{message: \"a quote: &quot; this & that\"}",
   },
   Object {
-    "col": 60,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 60,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 4,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "data-epoc",
     "type": "attribute",
     "val": "new Date(0)",
   },
   Object {
-    "col": 26,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 26,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs-data.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1930,54 +4765,135 @@ Array [
 exports[`test basic.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Title",
   },
   Object {
-    "col": 13,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/basic.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -1986,76 +4902,193 @@ Array [
 exports[`test blanks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blanks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2064,159 +5097,411 @@ Array [
 exports[`test block-code.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "blockcode",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "list = [\"uno\", \"dos\", \"tres\",",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "        \"cuatro\", \"cinco\", \"seis\"];",
   },
   Object {
-    "col": 38,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 38,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "comment",
     "val": " Without a block, the element is accepted and no code is generated",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "blockcode",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "code": "list",
-    "col": 1,
     "key": null,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "blockcode",
   },
   Object {
-    "col": 4,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 4,
+        "line": 7,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "string = item.charAt(0)",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "  .toUpperCase() +",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "item.slice(1);",
   },
   Object {
-    "col": 19,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 19,
+        "line": 11,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "string",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2225,124 +5510,313 @@ Array [
 exports[`test block-expansion.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 19,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 9,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 17,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 19,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2351,65 +5825,164 @@ Array [
 exports[`test block-expansion.shorthands.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "list-item",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 21,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 21,
+        "line": 2,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 23,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 23,
+        "line": 2,
+      },
+    },
     "type": "id",
     "val": "bar",
   },
   Object {
-    "col": 28,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 28,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 31,
-    "line": 2,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/block-expansion.shorthands.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2418,61 +5991,151 @@ Array [
 exports[`test blockquote.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "figure",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "blockquote",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 123,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Try to define yourself by what you do, and you&#8217;ll burnout every time. You are. That is enough. I rest in that.",
   },
   Object {
-    "col": 3,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "figcaption",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "from @thefray at 1:43pm on May 10",
   },
   Object {
-    "col": 47,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 47,
-    "line": 4,
-    "type": "eos",
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 47,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blockquote.pug",
+      "start": Object {
+        "column": 47,
+        "line": 4,
+      },
+    },
+    "type": "eos",
   },
 ]
 `;
@@ -2480,54 +6143,135 @@ Array [
 exports[`test blocks-in-blocks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/blocks-in-blocks-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Page 2",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2537,262 +6281,658 @@ exports[`test blocks-in-if.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 49,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " see https://github.com/pugjs/pug/issues/1589",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var ajax = true",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if( ajax )",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": " return only contents if ajax requests",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "contents",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "ajax contents",
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "else",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "comment",
     "val": " return all html",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 12,
   },
   Object {
-    "col": 13,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 13,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "meta",
   },
   Object {
-    "col": 17,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 17,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 19,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 19,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "charset",
     "type": "attribute",
     "val": "\'utf8\'",
   },
   Object {
-    "col": 34,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 34,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 13,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 13,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "title",
   },
   Object {
-    "col": 19,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 19,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "sample",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 13,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 13,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 16,
   },
   Object {
-    "col": 17,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 17,
+        "line": 18,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "contents",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 20,
   },
   Object {
-    "col": 21,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 21,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "all contetns",
   },
   Object {
-    "col": 17,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 9,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/blocks-in-if.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -2801,357 +6941,906 @@ Array [
 exports[`test case.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friends = 1",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "case",
     "val": "friends",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "when",
     "val": "0",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 15,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 15,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 17,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 17,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "you have no friends",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "when",
     "val": "1",
   },
   Object {
-    "col": 13,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 13,
+        "line": 6,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 15,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 15,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 17,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 17,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "you have a friend",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "default",
   },
   Object {
-    "col": 14,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 14,
+        "line": 7,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 16,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 16,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 18,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 18,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "you have ",
   },
   Object {
     "buffer": true,
-    "col": 27,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 27,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "friends",
   },
   Object {
-    "col": 37,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 37,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": " friends",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friends = 0",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "case",
     "val": "friends",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 10,
+      },
+    },
     "type": "when",
     "val": "0",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 11,
+      },
+    },
     "type": "when",
     "val": "1",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 9,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 11,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "you have very few friends",
   },
   Object {
-    "col": 7,
-    "line": 13,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "default",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 11,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "you have ",
   },
   Object {
     "buffer": true,
-    "col": 20,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 14,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "friends",
   },
   Object {
-    "col": 30,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 30,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": " friends",
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 16,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friend = \'Tim:G\'",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "case",
     "val": "friend",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 18,
+      },
+    },
     "type": "when",
     "val": "\'Tim:G\'",
   },
   Object {
-    "col": 19,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 19,
+        "line": 18,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 24,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 24,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 26,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 26,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "Friend is a string",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 7,
+        "line": 19,
+      },
+    },
     "type": "when",
     "val": "{tim: \'g\'}",
   },
   Object {
-    "col": 22,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 22,
+        "line": 19,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 24,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 24,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 26,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 26,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "Friend is an object",
   },
   Object {
-    "col": 5,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3160,172 +7849,433 @@ Array [
 exports[`test case-blocks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var friends = 1",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "case",
     "val": "friends",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "when",
     "val": "0",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "you have no friends",
   },
   Object {
-    "col": 7,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "when",
     "val": "1",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "you have a friend",
   },
   Object {
-    "col": 7,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 9,
+      },
+    },
     "type": "default",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 11,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "you have ",
   },
   Object {
     "buffer": true,
-    "col": 20,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "friends",
   },
   Object {
-    "col": 30,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 30,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": " friends",
   },
   Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 38,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/case-blocks.pug",
+      "start": Object {
+        "column": 38,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3352,158 +8302,401 @@ Object {
 exports[`test classes.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'foo\', \'bar\', \'baz\']",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 18,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 18,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 19,
+        "line": 5,
+      },
+    },
     "type": "class",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "class",
     "val": "foo-bar_baz",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 11,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "{foo: true, bar: false, baz: true}",
   },
   Object {
-    "col": 43,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 43,
+        "line": 11,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "-foo",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 2,
+        "line": 14,
+      },
+    },
     "type": "class",
     "val": "3foo",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3512,90 +8705,225 @@ Array [
 exports[`test classes-empty.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'\'",
   },
   Object {
-    "col": 11,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 11,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "null",
   },
   Object {
-    "col": 13,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 13,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "undefined",
   },
   Object {
-    "col": 18,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 18,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/classes-empty.pug",
+      "start": Object {
+        "column": 19,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -3604,506 +8932,1280 @@ Array [
 exports[`test code.conditionals.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (true)",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "else",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (true) {",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "} else {",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "}",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "if",
     "val": "true",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "if",
     "val": "!(true)",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 23,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "if",
     "val": "\'nested\'",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 26,
+      },
+    },
     "type": "if",
     "val": "\'works\'",
   },
   Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 5,
+        "line": 27,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 7,
+        "line": 27,
+      },
+    },
     "type": "text",
     "val": "yay",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "comment",
     "val": " allow empty blocks",
   },
   Object {
-    "col": 1,
-    "line": 30,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 31,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 32,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "if",
     "val": "true",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 34,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 35,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 36,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "class",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 38,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 39,
+      },
+    },
     "type": "class",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 40,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "else-if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 41,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 42,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 3,
+        "line": 43,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 43,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 7,
+        "line": 43,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.conditionals.pug",
+      "start": Object {
+        "column": 7,
+        "line": 43,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4112,41 +10214,95 @@ Array [
 exports[`test code.escape.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'<script>\'",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "\'<script>\'",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.escape.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4155,450 +10311,1089 @@ Array [
 exports[`test code.iteration.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var items = [1,2,3]",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "items.forEach(function(item){",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "})",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var items = [1,2,3]",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "items",
-    "col": 3,
     "key": "i",
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 8,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'item-\' + i",
   },
   Object {
-    "col": 25,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 25,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
     "buffer": true,
-    "col": 26,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 26,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 3,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "items",
-    "col": 3,
     "key": "i",
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 3,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "items",
-    "col": 3,
     "key": null,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "type": "each",
     "val": "$item",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 21,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "$item",
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var nums = [1, 2, 3]",
   },
   Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var letters = [\'a\', \'b\', \'c\']",
   },
   Object {
-    "col": 1,
-    "line": 26,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "letters",
-    "col": 3,
     "key": null,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "each",
     "val": "l",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "code": "nums",
-    "col": 5,
     "key": null,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 28,
+      },
+    },
     "type": "each",
     "val": "n",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 7,
+        "line": 29,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 10,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 10,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "n",
   },
   Object {
-    "col": 14,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 14,
+        "line": 29,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 16,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "l",
   },
   Object {
-    "col": 5,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var count = 1",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 66,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var counter = function() { return [count++, count++, count++] }",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "counter()",
-    "col": 3,
     "key": null,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 3,
+        "line": 34,
+      },
+    },
     "type": "each",
     "val": "n",
   },
   Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 5,
+        "line": 35,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 8,
+        "line": 35,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "n",
   },
   Object {
-    "col": 3,
-    "line": 36,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.iteration.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4607,243 +11402,603 @@ Array [
 exports[`test code.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "null",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "undefined",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'\'",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "0",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "null",
   },
   Object {
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "undefined",
   },
   Object {
-    "col": 16,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 16,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'\'",
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "0",
   },
   Object {
-    "col": 8,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 8,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 2,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "false",
   },
   Object {
-    "col": 12,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 12,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 13,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/code.pug",
+      "start": Object {
+        "column": 13,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -4852,346 +12007,895 @@ Array [
 exports[`test comments.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "comment",
     "val": " foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "buffer": true,
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "comment",
     "val": " bar",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "one",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": " baz",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 6,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "two",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "  li foo",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "comment",
     "val": " block",
   },
   Object {
-    "col": 9,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 9,
+        "line": 13,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "// inline follow",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "li three",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "comment",
     "val": " block",
   },
   Object {
-    "col": 9,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 9,
+        "line": 17,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "// inline followed by tags",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "  li four",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "comment",
     "val": "if IE lt 9",
   },
   Object {
-    "col": 13,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 13,
+        "line": 22,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "text",
     "val": "// inline",
   },
   Object {
-    "col": 1,
-    "line": 24,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "script(src=\'/lame.js\')",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "text",
     "val": "// end-inline",
   },
   Object {
-    "col": 1,
-    "line": 26,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 27,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "text",
     "val": "five",
   },
   Object {
-    "col": 1,
-    "line": 29,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 6,
+        "line": 29,
+      },
+    },
     "type": "text",
     "val": "// not a comment",
   },
   Object {
-    "col": 22,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.pug",
+      "start": Object {
+        "column": 22,
+        "line": 29,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5201,103 +12905,265 @@ exports[`test comments.source.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "s/s.",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "comment",
     "val": " test/cases/comments.source.pug",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "test/cases/comments.source.pug",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "when",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "()",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments.source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5306,153 +13172,387 @@ Array [
 exports[`test comments-in-case.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 3,
   },
   Object {
     "buffer": false,
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var s = \'this\'",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "case",
     "val": "s",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 5,
   },
   Object {
     "buffer": false,
-    "col": 6,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 6,
+        "line": 6,
+      },
+    },
     "type": "comment",
     "val": " Comment",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 6,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 6,
+        "line": 7,
+      },
+    },
     "type": "when",
     "val": "\'this\'",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 7,
   },
   Object {
-    "col": 8,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 8,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "It\'s this!",
   },
   Object {
-    "col": 6,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 6,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 6,
+        "line": 9,
+      },
+    },
     "type": "when",
     "val": "\'that\'",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 7,
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 10,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 10,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "It\'s that!",
   },
   Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 20,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/comments-in-case.pug",
+      "start": Object {
+        "column": 20,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5470,14 +13570,32 @@ Object {
 exports[`test doctype.custom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "custom stuff",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.custom.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5486,65 +13604,164 @@ Array [
 exports[`test doctype.default.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 8,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Title",
   },
   Object {
-    "col": 13,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.default.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5553,14 +13770,32 @@ Array [
 exports[`test doctype.keyword.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.keyword.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 13,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/doctype.keyword.pug",
+      "start": Object {
+        "column": 13,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -5569,545 +13804,1337 @@ Array [
 exports[`test each.else.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var users = []",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "users",
-    "col": 3,
     "key": null,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "each",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "user.name",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "no users!",
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var users = [{ name: \'tobi\', friends: [\'loki\'] }, { name: \'loki\' }]",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "if",
     "val": "users",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "code": "users",
-    "col": 5,
     "key": null,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "each",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 7,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 9,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 9,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "user.name",
   },
   Object {
-    "col": 5,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 7,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 10,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 10,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "no users!",
   },
   Object {
-    "col": 5,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = { name: \'tobi\', age: 10 }",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "user",
-    "col": 3,
     "key": "key",
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "each",
     "val": "val",
   },
   Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 24,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 24,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "key",
   },
   Object {
-    "col": 14,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 14,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 16,
+        "line": 24,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "val",
   },
   Object {
-    "col": 3,
-    "line": 25,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 26,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "user has no details!",
   },
   Object {
-    "col": 3,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = {}",
   },
   Object {
-    "col": 1,
-    "line": 30,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "user",
-    "col": 3,
     "key": "key",
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 31,
+      },
+    },
     "type": "each",
     "val": "prop",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 32,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "key",
   },
   Object {
-    "col": 14,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 14,
+        "line": 32,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 16,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "val",
   },
   Object {
-    "col": 3,
-    "line": 33,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 33,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 34,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 34,
+      },
+    },
     "type": "text",
     "val": "user has no details!",
   },
   Object {
-    "col": 3,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var user = Object.create(null)",
   },
   Object {
-    "col": 1,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 37,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 37,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "user.name = \'tobi\'",
   },
   Object {
-    "col": 1,
-    "line": 39,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "user",
-    "col": 3,
     "key": "key",
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 40,
+      },
+    },
     "type": "each",
     "val": "val",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 41,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 8,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "key",
   },
   Object {
-    "col": 14,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 14,
+        "line": 41,
+      },
+    },
     "type": "text",
     "val": ": ",
   },
   Object {
     "buffer": true,
-    "col": 16,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 16,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "val",
   },
   Object {
-    "col": 3,
-    "line": 42,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 3,
+        "line": 42,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 5,
+        "line": 43,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 8,
+        "line": 43,
+      },
+    },
     "type": "text",
     "val": "user has no details!",
   },
   Object {
-    "col": 3,
-    "line": 44,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 44,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6125,35 +15152,89 @@ Object {
 exports[`test escape-chars.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "var re = /\\d+/;",
   },
   Object {
-    "col": 18,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 18,
+        "line": 2,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 18,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-chars.pug",
+      "start": Object {
+        "column": 18,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6162,120 +15243,300 @@ Array [
 exports[`test escape-test.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "title",
   },
   Object {
-    "col": 15,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 15,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "escape-test",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "textarea",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 12,
   },
   Object {
     "buffer": false,
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 108,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var txt = \'<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>\'",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 15,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 15,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "txt",
   },
   Object {
-    "col": 9,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escape-test.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6284,182 +15545,461 @@ Array [
 exports[`test escaping-class-attribute.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "attr",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 22,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 22,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 23,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 23,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "name": "attr",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %>\"",
   },
   Object {
-    "col": 24,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 24,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %> lol rofl\"",
   },
   Object {
-    "col": 33,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 33,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
     "val": "\"<%= bar %> lol rofl <%= lmao %>\"",
   },
   Object {
-    "col": 45,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 45,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/escaping-class-attribute.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6477,24 +16017,60 @@ Object {
 exports[`test filter-in-include.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/filter-in-include.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filter-in-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6503,121 +16079,310 @@ Array [
 exports[`test filters.coffeescript.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/javascript\'",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "regexp = /\\n/",
   },
   Object {
-    "col": 18,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 18,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 17,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 17,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 18,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 18,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "minify",
     "type": "attribute",
     "val": "true",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 30,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 30,
+        "line": 4,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "math =",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "  square: (value) -> value * value",
   },
   Object {
-    "col": 39,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 39,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 39,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.coffeescript.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6626,123 +16391,312 @@ Array [
 exports[`test filters.custom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "custom",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "opt",
     "type": "attribute",
     "val": "\'val\'",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "num",
     "type": "attribute",
     "val": "2",
   },
   Object {
-    "col": 28,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 28,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Line 1",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Line 2",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "Line 4",
   },
   Object {
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 13,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.custom.pug",
+      "start": Object {
+        "column": 13,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6751,102 +16705,255 @@ Array [
 exports[`test filters.include.custom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "custom",
   },
   Object {
-    "col": 21,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 21,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "opt",
     "type": "attribute",
     "val": "\'val\'",
   },
   Object {
-    "col": 32,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 32,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "num",
     "type": "attribute",
     "val": "2",
   },
   Object {
-    "col": 37,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 37,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 39,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 39,
+        "line": 4,
+      },
+    },
     "type": "path",
     "val": "filters.include.custom.pug",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.custom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -6855,174 +16962,444 @@ Array [
 exports[`test filters.include.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "markdown-it",
   },
   Object {
-    "col": 25,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 25,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "some.md",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 28,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 28,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 29,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 29,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "minify",
     "type": "attribute",
     "val": "true",
   },
   Object {
-    "col": 40,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 40,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 42,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 42,
+        "line": 5,
+      },
+    },
     "type": "path",
     "val": "include-filter-coffee.coffee",
   },
   Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 14,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 14,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 20,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 20,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 34,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 34,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 35,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 35,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "name": "minify",
     "type": "attribute",
     "val": "false",
   },
   Object {
-    "col": 47,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 47,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 49,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 77,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 49,
+        "line": 7,
+      },
+    },
     "type": "path",
     "val": "include-filter-coffee.coffee",
   },
   Object {
-    "col": 5,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7031,48 +17408,120 @@ Array [
 exports[`test filters.inline.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "before ",
   },
   Object {
-    "col": 10,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 10,
+        "line": 1,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 12,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 12,
+        "line": 1,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 19,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 19,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "inside",
   },
   Object {
-    "col": 25,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 25,
+        "line": 1,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 26,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 26,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": " after",
   },
   Object {
-    "col": 32,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.inline.pug",
+      "start": Object {
+        "column": 32,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7081,132 +17530,339 @@ Array [
 exports[`test filters.less.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "style",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\"text/css\"",
   },
   Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "less",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "@pad: 15px;",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "body {",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "  padding: @pad;",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 10,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 10,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 10,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.less.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7215,75 +17871,192 @@ Array [
 exports[`test filters.markdown.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "markdown-it",
   },
   Object {
-    "col": 17,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "This is _some_ awesome **markdown**",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "whoop.",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 13,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.markdown.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7292,148 +18065,382 @@ Array [
 exports[`test filters.nested.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "filter",
     "val": "uglify-js",
   },
   Object {
-    "col": 19,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 19,
+        "line": 2,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "(function() {",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "  console.log(\'test\')",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "})()",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "uglify-js",
   },
   Object {
-    "col": 19,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 19,
+        "line": 7,
+      },
+    },
     "type": "filter",
     "val": "coffee-script",
   },
   Object {
-    "col": 33,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 33,
+        "line": 7,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "(->",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "  console.log \'test\'",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": ")()",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 8,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.nested.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7442,116 +18449,296 @@ Array [
 exports[`test filters.stylus.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "style",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\"text/css\"",
   },
   Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "filter",
     "val": "stylus",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "  padding: 50px",
   },
   Object {
-    "col": 24,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 24,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.stylus.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7560,75 +18747,192 @@ Array [
 exports[`test filters.verbatim.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 2,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "filter",
     "val": "verbatim",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "filters are applied at compile time",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "with no #[b interpolation] at #{all}",
   },
   Object {
-    "col": 41,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 41,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 41,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 41,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters.verbatim.pug",
+      "start": Object {
+        "column": 41,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7638,97 +18942,241 @@ exports[`test filters-empty.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var users = [{ name: \'tobi\', age: 2 }]",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "fb:users",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "code": "users",
-    "col": 3,
     "key": null,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "each",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "fb:user",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "age",
     "type": "attribute",
     "val": "user.age",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "filter",
     "val": "cdata",
   },
   Object {
-    "col": 5,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/filters-empty.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7738,151 +19186,385 @@ exports[`test html.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var version = 1449104952939",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "text-html",
     "val": "<ul>",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text-html",
     "val": "<li>foo</li>",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text-html",
     "val": "<li>bar</li>",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "text-html",
     "val": "<li>baz</li>",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "text-html",
     "val": "</ul>",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "text-html",
     "val": "<!--build:js /js/app.min.js?v=",
   },
   Object {
     "buffer": true,
-    "col": 31,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 31,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "version",
   },
   Object {
-    "col": 41,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 41,
+        "line": 9,
+      },
+    },
     "type": "text-html",
     "val": "-->",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "text-html",
     "val": "<!--endbuild-->",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "You can <em>embed</em> html as well.",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 4,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 59,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 4,
+        "line": 13,
+      },
+    },
     "type": "text-html",
     "val": "<strong>Even</strong> as the body of a block expansion.",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -7891,125 +19573,305 @@ Array [
 exports[`test html5.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'checkbox\'",
   },
   Object {
-    "col": 24,
-    "line": 2,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 24,
+        "line": 2,
+      },
+    },
+    "mustEscape": true,
     "name": "checked",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 31,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'checkbox\'",
   },
   Object {
-    "col": 24,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 24,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "checked",
     "type": "attribute",
     "val": "true",
   },
   Object {
-    "col": 36,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 36,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'checkbox\'",
   },
   Object {
-    "col": 24,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 24,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "checked",
     "type": "attribute",
     "val": "false",
   },
   Object {
-    "col": 37,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 37,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 38,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/html5.pug",
+      "start": Object {
+        "column": 38,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8018,60 +19880,150 @@ Array [
 exports[`test include.script.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "id",
     "val": "pet-template",
   },
   Object {
-    "col": 20,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 20,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 43,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 43,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 11,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/pet.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.script.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8080,64 +20032,163 @@ Array [
 exports[`test include.yield.nested.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/yield-nested.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "some content",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "and some more",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include.yield.nested.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8146,24 +20197,60 @@ Array [
 exports[`test include-extends-from-root.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "/auxiliary/extends-from-root.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-from-root.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8172,40 +20259,103 @@ Array [
 exports[`test include-extends-of-common-template.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "auxiliary/extends-empty-block-1.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/extends-empty-block-2.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-of-common-template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8214,24 +20364,60 @@ Array [
 exports[`test include-extends-relative.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "../cases/auxiliary/extends-relative.pug",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-extends-relative.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8276,93 +20462,237 @@ Object {
 exports[`test include-only-text.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 15,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 15,
+        "line": 4,
+      },
+    },
     "type": "path",
     "val": "include-only-text-body.pug",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "em",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "hello world",
   },
   Object {
-    "col": 7,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8371,40 +20701,103 @@ Array [
 exports[`test include-only-text-body.pug 1`] = `
 Array [
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "The message is \"",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "\"",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-only-text-body.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8413,100 +20806,253 @@ Array [
 exports[`test include-with-text.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 11,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "include-with-text-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/caustic.js\'",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/app.js\'",
   },
   Object {
-    "col": 25,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 25,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8515,70 +21061,178 @@ Array [
 exports[`test include-with-text-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/javascript\'",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 33,
+        "line": 2,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 34,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 34,
+        "line": 2,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "alert(\'hello world\');",
   },
   Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 26,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 26,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/include-with-text-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8587,142 +21241,367 @@ Array [
 exports[`test includes.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/mixins.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 11,
+        "line": 7,
+      },
+    },
     "type": "path",
     "val": "auxiliary/smile.html",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "type": "path",
     "val": "auxiliary/escapes.html",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 9,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 10,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\"text/javascript\"",
   },
   Object {
-    "col": 32,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 32,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 12,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 12,
+        "line": 10,
+      },
+    },
     "type": "filter",
     "val": "verbatim",
   },
   Object {
-    "col": 22,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 22,
+        "line": 10,
+      },
+    },
     "type": "path",
     "val": "auxiliary/includable.js",
   },
   Object {
-    "col": 3,
-    "line": 11,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8731,53 +21610,134 @@ Array [
 exports[`test includes-with-ext-js.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "code",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "javascript-new-lines.js",
   },
   Object {
-    "col": 3,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/includes-with-ext-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8795,76 +21755,193 @@ Object {
 exports[`test inheritance.alert-dialog.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/dialog.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Alert!",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "I\'m an alert!",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.alert-dialog.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -8873,142 +21950,358 @@ Array [
 exports[`test inheritance.defaults.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'keymaster.js\'",
   },
   Object {
-    "col": 32,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 32,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 13,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 14,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'caustic.js\'",
   },
   Object {
-    "col": 30,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 30,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 31,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.defaults.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9017,165 +22310,417 @@ Array [
 exports[`test inheritance.extend.include.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.include.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "window-content",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 6,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "Awesome",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Now we can extend included blocks!",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9184,54 +22729,135 @@ Array [
 exports[`test inheritance.extend.mixins.block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "auxiliary/inheritance.extend.mixin.block.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Hello World!",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9240,131 +22866,329 @@ Array [
 exports[`test inheritance.extend.mixins.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "title",
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "mixin",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "if",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": "\"The meaning of life\"",
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "call",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "Foo bar baz!",
   },
   Object {
-    "col": 3,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9373,118 +23197,298 @@ Array [
 exports[`test inheritance.extend.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9493,54 +23497,135 @@ Array [
 exports[`test inheritance.extend.recursive.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 59,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "/auxiliary/inheritance.extend.recursive-parent.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "parent",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h4",
   },
   Object {
-    "col": 8,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 8,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "child",
   },
   Object {
-    "col": 13,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.recursive.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9549,118 +23634,298 @@ Array [
 exports[`test inheritance.extend.whitespace.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 25,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 6,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.extend.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9669,118 +23934,298 @@ Array [
 exports[`test inheritance.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "auxiliary/layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 25,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 25,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Page",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "Some content",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inheritance.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9789,65 +24234,155 @@ Array [
 exports[`test inline-block-comment.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 15,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " Main content goes here",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "content",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "type": "comment",
     "val": " adding something to content",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "content",
   },
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "comment",
     "val": " adding something to other end of content",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-block-comment.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -9856,437 +24391,1130 @@ Array [
 exports[`test inline-tag.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "bing ",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 10,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 10,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 17,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 17,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 20,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 20,
+        "line": 1,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": " bong",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 15,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 15,
+        "line": 5,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 16,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 16,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'[foo]\'",
   },
   Object {
-    "col": 20,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 20,
+        "line": 6,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 21,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 21,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'foo]\'",
   },
   Object {
-    "col": 23,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 7,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 24,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 24,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "bong",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "bing",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 14,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 14,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 17,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 17,
+        "line": 12,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 18,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 18,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
     "buffer": true,
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'[foo]\'",
   },
   Object {
-    "col": 22,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 22,
+        "line": 13,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 23,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "buffer": false,
-    "col": 7,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 7,
+        "line": 14,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'foo]\'",
   },
   Object {
-    "col": 25,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 25,
+        "line": 14,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 26,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 26,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "bong",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 2,
+        "line": 17,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 3,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 17,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "#[strong escaped]",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "#[",
   },
   Object {
-    "col": 6,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 6,
+        "line": 19,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 8,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 8,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
-    "col": 15,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 15,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "escaped",
   },
   Object {
-    "col": 22,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 22,
+        "line": 19,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 23,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/inline-tag.pug",
+      "start": Object {
+        "column": 23,
+        "line": 19,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10295,228 +25523,570 @@ Array [
 exports[`test intepolated-elements.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 6,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 6,
+        "line": 1,
+      },
+    },
     "type": "class",
     "val": "rho",
   },
   Object {
-    "col": 10,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 10,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 11,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'rho--modifier\'",
   },
   Object {
-    "col": 42,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 42,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 44,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 44,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "with inline link",
   },
   Object {
-    "col": 60,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 60,
+        "line": 1,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 61,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 61,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "Some text ",
   },
   Object {
-    "col": 13,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 13,
+        "line": 2,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 16,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "rho",
   },
   Object {
-    "col": 20,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 20,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 21,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 31,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 31,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'rho--modifier\'",
   },
   Object {
-    "col": 52,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 53,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 52,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 53,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 53,
+        "line": 2,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 54,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 54,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Some text ",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 15,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 15,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "rho",
   },
   Object {
-    "col": 20,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 20,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 31,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 31,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'rho--modifier\'",
   },
   Object {
-    "col": 52,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 53,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 52,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 54,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 54,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "with inline link",
   },
   Object {
-    "col": 70,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 70,
+        "line": 3,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 71,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 71,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 71,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/intepolated-elements.pug",
+      "start": Object {
+        "column": 71,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10535,92 +26105,227 @@ exports[`test interpolated-mixin.pug 1`] = `
 Array [
   Object {
     "args": "url",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "linkit",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "url",
   },
   Object {
-    "col": 13,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 13,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
     "buffer": true,
-    "col": 14,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 14,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "url",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "This also works ",
   },
   Object {
-    "col": 19,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 19,
+        "line": 4,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "args": "\'http://www.bing.com\'",
-    "col": 21,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 21,
+        "line": 4,
+      },
+    },
     "type": "call",
     "val": "linkit",
   },
   Object {
-    "col": 51,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 51,
+        "line": 4,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 52,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 52,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": " so hurrah for Pug",
   },
   Object {
-    "col": 70,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 70,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolated-mixin.pug",
+      "start": Object {
+        "column": 70,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10629,90 +26334,225 @@ Array [
 exports[`test interpolation.escape.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var id = 42;",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "some",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "#{text}",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "here",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "My ID ",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 11,
+        "line": 7,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "\"is {\" + id + \"}\"",
   },
   Object {
-    "col": 31,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 31,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 31,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
+      "start": Object {
+        "column": 31,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10757,100 +26597,253 @@ Object {
 exports[`test layout.append.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/append/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10859,100 +26852,253 @@ Array [
 exports[`test layout.append.without-block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 56,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/append-without-block/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.append.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -10961,276 +27107,690 @@ Array [
 exports[`test layout.multi.append.prepend.block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "../fixtures/multi-append-prepend-block/redefine.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "class",
     "val": "first",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "class",
     "val": "append",
   },
   Object {
-    "col": 17,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 17,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Something appended to content",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "first",
   },
   Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "prepend",
   },
   Object {
-    "col": 18,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 18,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "Something prepended to content",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "last",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "append",
   },
   Object {
-    "col": 16,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 16,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "Last append must be most last",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "last",
   },
   Object {
-    "col": 8,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "prepend",
   },
   Object {
-    "col": 17,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 48,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 17,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Last prepend must appear at top",
   },
   Object {
-    "col": 1,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "mode": "append",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 8,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 16,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 16,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'jquery.js\'",
   },
   Object {
-    "col": 24,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 24,
+        "line": 16,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 1,
   },
   Object {
-    "col": 2,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 2,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 8,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 21,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 21,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.multi.append.prepend.block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -11239,100 +27799,253 @@ Array [
 exports[`test layout.prepend.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/prepend/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -11341,100 +28054,253 @@ Array [
 exports[`test layout.prepend.without-block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "path",
     "val": "../fixtures/prepend-without-block/app-layout.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "mode": "prepend",
     "type": "block",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo.js\'",
   },
   Object {
-    "col": 22,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar.js\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/layout.prepend.without-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -11489,975 +28355,2397 @@ exports[`test mixin.attrs.pug 1`] = `
 Array [
   Object {
     "args": "title",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "centered",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "centered",
   },
   Object {
-    "col": 15,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 16,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 16,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "attributes.id",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (title)",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "attributes.class",
   },
   Object {
-    "col": 32,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 32,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
     "buffer": true,
-    "col": 33,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "if (attributes.href)",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "class",
     "val": "footer",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 10,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 11,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "attributes.href",
   },
   Object {
-    "col": 31,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 33,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 33,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "Back",
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "title",
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "mixin",
     "val": "main",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 11,
+      },
+    },
     "type": "class",
     "val": "stretch",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "title",
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 21,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 12,
+      },
+    },
     "type": "class",
     "val": "highlight",
   },
   Object {
-    "col": 31,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 12,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "mixin",
     "val": "bottom",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 16,
+      },
+    },
     "type": "class",
     "val": "bottom",
   },
   Object {
-    "col": 13,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 16,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 20,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 12,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 12,
+        "line": 20,
+      },
+    },
     "type": "id",
     "val": "First",
   },
   Object {
-    "col": 19,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 19,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "Hello World",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "\'Section 1\'",
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 21,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 25,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 25,
+        "line": 21,
+      },
+    },
     "type": "id",
     "val": "Second",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "Some important content.",
   },
   Object {
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'Section 2\'",
-    "col": 3,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 23,
+      },
+    },
     "type": "call",
     "val": "centered",
   },
   Object {
-    "col": 25,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 25,
+        "line": 23,
+      },
+    },
     "type": "id",
     "val": "Third",
   },
   Object {
-    "col": 31,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 23,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 35,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 35,
+        "line": 23,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 36,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 36,
+        "line": 23,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'menu.html\'",
   },
   Object {
-    "col": 54,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 54,
+        "line": 23,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 65,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 66,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 65,
+        "line": 23,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 24,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "Even more important content.",
   },
   Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'Section 3\'",
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "call",
     "val": "main",
   },
   Object {
-    "col": 21,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 21,
+        "line": 25,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 22,
+        "line": 25,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'#\'",
   },
   Object {
-    "col": 30,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 25,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 26,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "Last content.",
   },
   Object {
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "call",
     "val": "bottom",
   },
   Object {
-    "col": 10,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 27,
+      },
+    },
     "type": "class",
     "val": "foo",
   },
   Object {
-    "col": 14,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 14,
+        "line": 27,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 15,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 15,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 28,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 28,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'end\'",
   },
   Object {
-    "col": 40,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 49,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 40,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "\'Last\'",
   },
   Object {
-    "col": 51,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 66,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 51,
+        "line": 27,
+      },
+    },
     "mustEscape": true,
     "name": "data-attr",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 66,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 67,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 66,
+        "line": 27,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 28,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 7,
+        "line": 28,
+      },
+    },
     "type": "text",
     "val": "Some final words.",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 29,
+      },
+    },
     "type": "call",
     "val": "bottom",
   },
   Object {
-    "col": 10,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 10,
+        "line": 29,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 11,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "[\'class1\', \'class2\']",
   },
   Object {
-    "col": 37,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 37,
+        "line": 29,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 32,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 32,
+      },
+    },
     "type": "class",
     "val": "thing",
   },
   Object {
-    "col": 12,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 12,
+        "line": 32,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 13,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "name": "attr1",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 26,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 26,
+        "line": 32,
+      },
+    },
     "mustEscape": true,
     "name": "attr2",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 37,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 37,
+        "line": 32,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 38,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 38,
+        "line": 32,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var val = \'<biz>\'",
   },
   Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var classes = [\'foo\', \'bar\']",
   },
   Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 5,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 6,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 36,
+      },
+    },
     "mustEscape": true,
     "name": "attr3",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 18,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 18,
+        "line": 36,
+      },
+    },
     "mustEscape": true,
     "name": "data-foo",
     "type": "attribute",
     "val": "val",
   },
   Object {
-    "col": 31,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 31,
+        "line": 36,
+      },
+    },
     "mustEscape": false,
     "name": "data-bar",
     "type": "attribute",
     "val": "val",
   },
   Object {
-    "col": 45,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 58,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 45,
+        "line": 36,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "classes",
   },
   Object {
-    "col": 58,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 59,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 58,
+        "line": 36,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 59,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 59,
+        "line": 36,
+      },
+    },
     "type": "class",
     "val": "thunk",
   },
   Object {
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
     "type": "comment",
     "val": " Regression test for #1424",
   },
   Object {
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "work",
-    "col": 1,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
     "type": "mixin",
     "val": "work_filmstrip_item",
   },
   Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 40,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 6,
+        "line": 40,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
     "buffer": true,
-    "col": 29,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 29,
+        "line": 40,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "work",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'work\'",
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "call",
     "val": "work_filmstrip_item",
   },
   Object {
-    "col": 29,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 29,
+        "line": 41,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 31,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 54,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 30,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "name": "data-profile",
     "type": "attribute",
     "val": "\'profile\'",
   },
   Object {
-    "col": 56,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 82,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 56,
+        "line": 41,
+      },
+    },
     "mustEscape": true,
     "name": "data-creator-name",
     "type": "attribute",
     "val": "\'name\'",
   },
   Object {
-    "col": 82,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 83,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 82,
+        "line": 41,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "arg1, arg2, arg3, arg4",
-    "col": 1,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 43,
+      },
+    },
     "type": "mixin",
     "val": "my-mixin",
   },
   Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 44,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 44,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg1",
   },
   Object {
-    "col": 1,
-    "line": 45,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 45,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 45,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 45,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 45,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 45,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg2",
   },
   Object {
-    "col": 1,
-    "line": 46,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 46,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 46,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 46,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg3",
   },
   Object {
-    "col": 1,
-    "line": 47,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 47,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 47,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 47,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 47,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 47,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
     "buffer": true,
-    "col": 4,
-    "line": 47,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 47,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 4,
+        "line": 47,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "arg4",
   },
   Object {
-    "col": 1,
-    "line": 49,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 49,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 49,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 49,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 49,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 49,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 5,
-    "line": 49,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 49,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 5,
+        "line": 49,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 50,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 50,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 50,
+      },
+    },
     "mustEscape": true,
     "name": "attr3",
     "type": "attribute",
     "val": "\"qux\"",
   },
   Object {
-    "col": 3,
-    "line": 51,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 51,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 3,
+        "line": 51,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"baz\"",
   },
   Object {
-    "col": 1,
-    "line": 52,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 52,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 52,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 54,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 54,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 54,
+      },
+    },
     "type": "newline",
   },
   Object {
@@ -12467,19 +30755,46 @@ Array [
   \'3\',
       \'4\'
 ",
-    "col": 1,
-    "line": 54,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 59,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 54,
+      },
+    },
     "type": "call",
     "val": "my-mixin",
   },
   Object {
-    "col": 1,
-    "line": 60,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 60,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 60,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 60,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 60,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.attrs.pug",
+      "start": Object {
+        "column": 1,
+        "line": 60,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -12488,324 +30803,828 @@ Array [
 exports[`test mixin.block-tag-behaviour.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "name",
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "mixin",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "section",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "name",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'Foo\'",
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "call",
     "val": "article",
   },
   Object {
-    "col": 20,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 20,
+        "line": 9,
+      },
+    },
     "type": ":",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 24,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 24,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "I\'m article foo",
   },
   Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "name",
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "mixin",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "section",
   },
   Object {
-    "col": 10,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 10,
+        "line": 12,
+      },
+    },
     "type": "class",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "name",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 15,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'Something\'",
-    "col": 5,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 5,
+        "line": 19,
+      },
+    },
     "type": "call",
     "val": "article",
   },
   Object {
-    "col": 26,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 26,
+        "line": 19,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 27,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 27,
+        "line": 19,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "I\'m a much longer",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "text-only article,",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "but you can still",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 23,
+      },
+    },
     "type": "text",
     "val": "inline html tags",
   },
   Object {
-    "col": 1,
-    "line": 24,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 7,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "in me if you want.",
   },
   Object {
-    "col": 25,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 25,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 25,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.block-tag-behaviour.pug",
+      "start": Object {
+        "column": 25,
+        "line": 24,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -12814,653 +31633,1625 @@ Array [
 exports[`test mixin.blocks.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "method, action",
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "mixin",
     "val": "form",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "form",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 8,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "method",
     "type": "attribute",
     "val": "method",
   },
   Object {
-    "col": 23,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 23,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "action",
     "type": "attribute",
     "val": "action",
   },
   Object {
-    "col": 36,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 36,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var csrf_token_from_somewhere = \'hey\'",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 10,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 10,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 11,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 11,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'hidden\'",
   },
   Object {
-    "col": 26,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 26,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'_csrf\'",
   },
   Object {
-    "col": 40,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 71,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 40,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "csrf_token_from_somewhere",
   },
   Object {
-    "col": 71,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 72,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 71,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'GET\', \'/search\'",
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "call",
     "val": "form",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 26,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 26,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'query\'",
   },
   Object {
-    "col": 40,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 40,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "placeholder",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 60,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 60,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'submit\'",
   },
   Object {
-    "col": 28,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 28,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 42,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 42,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'POST\', \'/search\'",
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "call",
     "val": "form",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 18,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 26,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 26,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'query\'",
   },
   Object {
-    "col": 40,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 40,
+        "line": 18,
+      },
+    },
     "mustEscape": true,
     "name": "placeholder",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 60,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 61,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 60,
+        "line": 18,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 12,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 12,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 13,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 13,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'submit\'",
   },
   Object {
-    "col": 28,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 28,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'Search\'",
   },
   Object {
-    "col": 42,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 42,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 21,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 21,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'POST\', \'/search\'",
-    "col": 5,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 23,
+      },
+    },
     "type": "call",
     "val": "form",
   },
   Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "mixin",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 26,
+      },
+    },
     "type": "id",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 27,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 30,
+      },
+    },
     "type": "id",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 31,
+      },
+    },
     "type": "call",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 32,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 35,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 35,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 35,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 35,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 35,
+      },
+    },
     "type": "text",
     "val": "one",
   },
   Object {
-    "col": 1,
-    "line": 36,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 36,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
     "type": "text",
     "val": "two",
   },
   Object {
-    "col": 1,
-    "line": 37,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 37,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 37,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 37,
+      },
+    },
     "type": "text",
     "val": "three",
   },
   Object {
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
     "type": "mixin",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 41,
+      },
+    },
     "type": "id",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 9,
+        "line": 42,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 5,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "",
-    "col": 1,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
     "type": "call",
     "val": "baz",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 7,
+        "line": 44,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'123\'",
   },
   Object {
-    "col": 14,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.blocks.pug",
+      "start": Object {
+        "column": 14,
+        "line": 44,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13470,346 +33261,868 @@ exports[`test mixin.merge.pug 1`] = `
 Array [
   Object {
     "args": null,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 32,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 32,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "One",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "baz",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "class",
     "val": "quux",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 37,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 37,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "Two",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 28,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 28,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "Three",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 4,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 4,
+        "line": 5,
+      },
+    },
     "type": "class",
     "val": "bar",
   },
   Object {
-    "col": 8,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 5,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 31,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 31,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 32,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 32,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"baz\"",
   },
   Object {
-    "col": 43,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 43,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 45,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 49,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 45,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Four",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 9,
+      },
+    },
     "type": "id",
     "val": "world",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 13,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 10,
+      },
+    },
     "type": "id",
     "val": "world",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 11,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 13,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 11,
+      },
+    },
     "type": "class",
     "val": "world",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 8,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"hello\"",
   },
   Object {
-    "col": 21,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 21,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "hello",
   },
   Object {
-    "col": 13,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 13,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 14,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "\"world\"",
   },
   Object {
-    "col": 27,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 27,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 7,
+        "line": 15,
+      },
+    },
     "type": "&attributes",
     "val": "{class: \"hello\"}",
   },
   Object {
-    "col": 36,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 36,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 36,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin.merge.pug",
+      "start": Object {
+        "column": 36,
+        "line": 15,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13818,54 +34131,135 @@ Array [
 exports[`test mixin-at-end-of-file.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/mixin-at-end-of-file.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "",
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "call",
     "val": "slide",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "some awesome content",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-at-end-of-file.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13875,71 +34269,179 @@ exports[`test mixin-block-with-space.pug 1`] = `
 Array [
   Object {
     "args": "id",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "m",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "",
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "call",
     "val": "m",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 5,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "This text should appear",
   },
   Object {
-    "col": 28,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 28,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 28,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-block-with-space.pug",
+      "start": Object {
+        "column": 28,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -13948,86 +34450,212 @@ Array [
 exports[`test mixin-hoist.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "mixin",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
     "buffer": true,
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 5,
+        "line": 7,
+      },
+    },
     "type": "call",
     "val": "foo",
   },
   Object {
-    "col": 3,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-hoist.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14037,42 +34665,105 @@ exports[`test mixin-via-include.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " regression test for https://github.com/pugjs/pug/issues/1435",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "include",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "include",
-  },
-  Object {
-    "col": 9,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 38,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 9,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "../fixtures/mixin-include.pug",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "call",
     "val": "bang",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixin-via-include.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14082,394 +34773,979 @@ exports[`test mixins.pug 1`] = `
 Array [
   Object {
     "args": "title, str",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "class",
     "val": "body",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "str",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "title, str",
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "mixin",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "class",
     "val": "comment",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 7,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 6,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 10,
+      },
+    },
     "type": "class",
     "val": "body",
   },
   Object {
     "buffer": true,
-    "col": 11,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 11,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "str",
   },
   Object {
-    "col": 3,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "id",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 6,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 13,
+      },
+    },
     "type": "text",
     "val": "Tobi",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "class",
     "val": "comments",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "args": "\'This\',
             ((\'is regular, javascript\'))",
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "call",
     "val": "comment",
   },
   Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 1,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
     "type": "mixin",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 20,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 21,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 22,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 5,
+        "line": 22,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 8,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 8,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 3,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 24,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 24,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": "",
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 25,
+      },
+    },
     "type": "call",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "",
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 26,
+      },
+    },
     "type": "call",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "str",
-    "col": 1,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
     "type": "mixin",
     "val": "foobar",
   },
   Object {
-    "col": 1,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 3,
+        "line": 29,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 6,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 6,
+        "line": 29,
+      },
+    },
     "type": "id",
     "val": "interpolation",
   },
   Object {
     "buffer": true,
-    "col": 20,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 20,
+        "line": 29,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "str + \'interpolated\'",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var suffix = \"bar\"",
   },
   Object {
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "\'This is \'",
-    "col": 1,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
     "type": "call",
     "val": "#{\'foo\' + suffix}",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14479,87 +35755,213 @@ exports[`test mixins.rest-args.pug 1`] = `
 Array [
   Object {
     "args": "tag, ...items",
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "interpolation",
     "val": "tag",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "code": "items",
-    "col": 5,
     "key": null,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "each",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "item",
   },
   Object {
-    "col": 5,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "outdent",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": "\'ul\', 1, 2, 3, 4",
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "call",
     "val": "list",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins.rest-args.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14569,43 +35971,106 @@ exports[`test mixins-unused.pug 1`] = `
 Array [
   Object {
     "args": null,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "mixin",
     "val": "never-called",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "wtf",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "This isn\'t something we ever want to output",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/mixins-unused.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14623,49 +36088,121 @@ Object {
 exports[`test namespaces.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "fb:user:role",
   },
   Object {
-    "col": 14,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 14,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "Something",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 4,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 4,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 5,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 5,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "fb:foo",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 17,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 17,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 18,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/namespaces.pug",
+      "start": Object {
+        "column": 18,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14674,134 +36211,341 @@ Array [
 exports[`test nesting.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "a",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "b",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 12,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 12,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "c",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 9,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 12,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 12,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "d",
   },
   Object {
-    "col": 5,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "e",
   },
   Object {
-    "col": 7,
-    "line": 8,
-    "type": "outdent",
-  },
-  Object {
-    "col": 7,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/nesting.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14829,52 +36573,133 @@ exports[`test pipeless-comments.pug 1`] = `
 Array [
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "     .foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "	.bar",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": ".hey",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-comments.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14883,52 +36708,133 @@ Array [
 exports[`test pipeless-filters.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "filter",
     "val": "markdown-it",
   },
   Object {
-    "col": 13,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 13,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "    code sample",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "# Heading",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-filters.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -14937,84 +36843,210 @@ Array [
 exports[`test pipeless-tag.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "  what",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "is ",
   },
   Object {
     "buffer": true,
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "\'going\'",
   },
   Object {
-    "col": 16,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 16,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": " ",
   },
   Object {
-    "col": 17,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 17,
+        "line": 3,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
     "buffer": true,
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "\'on\'",
   },
   Object {
-    "col": 28,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 28,
+        "line": 3,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 29,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pipeless-tag.pug",
+      "start": Object {
+        "column": 29,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15023,139 +37055,364 @@ Array [
 exports[`test pre.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 4,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 4,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 5,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "code",
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 7,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 8,
-    "line": 10,
-    "type": "outdent",
-  },
-  Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/pre.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15164,37 +37421,91 @@ Array [
 exports[`test quotes.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "\"foo\"",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "\'foo\'",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/quotes.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15204,34 +37515,79 @@ exports[`test regression.784.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var url = \'http://www.google.com\'",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "class",
     "val": "url",
   },
   Object {
     "buffer": true,
-    "col": 6,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 6,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "type": "interpolated-code",
     "val": "url.replace(\'http://\', \'\').replace(/^www\\./, \'\')",
   },
   Object {
-    "col": 57,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.784.pug",
+      "start": Object {
+        "column": 57,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15240,53 +37596,134 @@ Array [
 exports[`test regression.1794.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "extends",
   },
   Object {
-    "col": 9,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 37,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 9,
+        "line": 1,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/1794-extends.pug",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mode": "replace",
     "type": "block",
     "val": "content",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "type": "path",
     "val": "./auxiliary/1794-include.pug",
   },
   Object {
-    "col": 39,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 39,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 39,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/regression.1794.pug",
+      "start": Object {
+        "column": 39,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15295,79 +37732,205 @@ Array [
 exports[`test script.whitespace.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "if (foo) {",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "  ",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "  bar();",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 4,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/script.whitespace.pug",
+      "start": Object {
+        "column": 4,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15376,168 +37939,429 @@ Array [
 exports[`test scripts.non-js.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "id",
     "val": "user-template",
   },
   Object {
-    "col": 21,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/template\'",
   },
   Object {
-    "col": 42,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 42,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "id",
     "val": "user",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h1",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "<%= user.name %>",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "<%= user.description %>",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "id",
     "val": "user-template",
   },
   Object {
-    "col": 21,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/template\'",
   },
   Object {
-    "col": 42,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 42,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 43,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 43,
+        "line": 6,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 44,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 44,
+        "line": 6,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "if (foo) {",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "  bar();",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 4,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 4,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.non-js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15546,115 +38370,295 @@ Array [
 exports[`test scripts.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "if (foo) {",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "  bar();",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 4,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 4,
+        "line": 4,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "\'foo()\'",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "foo()",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 4,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/scripts.pug",
+      "start": Object {
+        "column": 4,
+        "line": 8,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15663,64 +38667,163 @@ Array [
 exports[`test self-closing-html.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "br",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/self-closing-html.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15729,20 +38832,47 @@ Array [
 exports[`test single-period.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/single-period.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "span",
   },
   Object {
-    "col": 6,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/single-period.pug",
+      "start": Object {
+        "column": 6,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/single-period.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15751,129 +38881,318 @@ Array [
 exports[`test source.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "audio",
   },
   Object {
-    "col": 8,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 8,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "preload",
     "type": "attribute",
     "val": "\'auto\'",
   },
   Object {
-    "col": 25,
-    "line": 2,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 35,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 25,
+        "line": 2,
+      },
+    },
+    "mustEscape": true,
     "name": "autobuffer",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 37,
-    "line": 2,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 37,
+        "line": 2,
+      },
+    },
+    "mustEscape": true,
     "name": "controls",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 45,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 45,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "source",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 12,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'foo\'",
   },
   Object {
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "source",
   },
   Object {
-    "col": 11,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 11,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 12,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 21,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 21,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 22,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 22,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/source.pug",
+      "start": Object {
+        "column": 22,
+        "line": 4,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -15882,374 +39201,950 @@ Array [
 exports[`test styles.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "style",
   },
   Object {
-    "col": 10,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 3,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 11,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 11,
+        "line": 3,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "body {",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "  padding: 50px;",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "}",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 43,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "\'color:red;background:green\'",
   },
   Object {
-    "col": 43,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 43,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 9,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 50,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 9,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: \'green\'}",
   },
   Object {
-    "col": 50,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 50,
+        "line": 9,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 58,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 10,
+      },
+    },
     "type": "&attributes",
     "val": "{style: \'color:red;background:green\'}",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 65,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 11,
+      },
+    },
     "type": "&attributes",
     "val": "{style: {color: \'red\', background: \'green\'}}",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "mixin",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 7,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 10,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 13,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "outdent",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 14,
+      },
+    },
     "type": "call",
     "val": "div",
   },
   Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 14,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "\'color:red;background:green\'",
   },
   Object {
-    "col": 44,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 44,
+        "line": 14,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "call",
     "val": "div",
   },
   Object {
-    "col": 9,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 15,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 51,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 15,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: \'green\'}",
   },
   Object {
-    "col": 51,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 52,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 51,
+        "line": 15,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 16,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var bg = \'green\';",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 17,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: bg}",
   },
   Object {
-    "col": 45,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 45,
+        "line": 17,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 18,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 8,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 60,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 8,
+        "line": 18,
+      },
+    },
     "type": "&attributes",
     "val": "{style: {color: \'red\', background: bg}}",
   },
   Object {
-    "col": 1,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 5,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 5,
+        "line": 19,
+      },
+    },
     "type": "call",
     "val": "div",
   },
   Object {
-    "col": 9,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 9,
+        "line": 19,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 10,
+        "line": 19,
+      },
+    },
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
     "val": "{color: \'red\', background: bg}",
   },
   Object {
-    "col": 46,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 47,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 46,
+        "line": 19,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 3,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/styles.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -16258,387 +40153,981 @@ Array [
 exports[`test tag.interpolation.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var tag = \'p\'",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'bar\'",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "interpolation",
     "val": "tag",
   },
   Object {
-    "col": 8,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "value",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "interpolation",
     "val": "tag",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
     "val": "\'bar\'",
   },
   Object {
-    "col": 17,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 17,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 19,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 19,
+        "line": 6,
+      },
+    },
     "type": "text",
     "val": "value",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "interpolation",
     "val": "foo ? \'a\' : \'li\'",
   },
   Object {
-    "col": 20,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 20,
+        "line": 7,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 21,
-    "line": 7,
-    "mustEscape": false,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 21,
+        "line": 7,
+      },
+    },
+    "mustEscape": true,
     "name": "something",
     "type": "attribute",
     "val": true,
   },
   Object {
-    "col": 30,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 30,
+        "line": 7,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 32,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 32,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "here",
   },
   Object {
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": "icon",
-    "col": 1,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
     "type": "mixin",
     "val": "item",
   },
   Object {
-    "col": 1,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
-    "col": 1,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 5,
+        "line": 11,
+      },
+    },
     "type": "if",
     "val": "attributes.href",
   },
   Object {
-    "col": 1,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 7,
+        "line": 12,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 8,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 12,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 13,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 12,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 12,
+        "line": 13,
+      },
+    },
     "type": "class",
     "val": "icon",
   },
   Object {
-    "col": 17,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 17,
+        "line": 13,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 18,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 18,
+        "line": 13,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "icon",
   },
   Object {
-    "col": 26,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 26,
+        "line": 13,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 14,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 7,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 15,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 5,
+        "line": 15,
+      },
+    },
     "type": "else",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 7,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "span",
   },
   Object {
-    "col": 11,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 11,
+        "line": 16,
+      },
+    },
     "type": "&attributes",
     "val": "attributes",
   },
   Object {
-    "col": 1,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "indent",
     "val": 8,
   },
   Object {
-    "col": 9,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 17,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 12,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 12,
+        "line": 17,
+      },
+    },
     "type": "class",
     "val": "icon",
   },
   Object {
-    "col": 17,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 17,
+        "line": 17,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 18,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 18,
+        "line": 17,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "icon",
   },
   Object {
-    "col": 26,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 26,
+        "line": 17,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 9,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 18,
+      },
+    },
     "type": "mixin-block",
   },
   Object {
-    "col": 7,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 5,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
     "args": "\'contact\'",
-    "col": 3,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 3,
+        "line": 21,
+      },
+    },
     "type": "call",
     "val": "item",
   },
   Object {
-    "col": 20,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 20,
+        "line": 21,
+      },
+    },
     "type": "text",
     "val": "Contact",
   },
   Object {
-    "col": 1,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
     "type": "newline",
   },
   Object {
     "args": null,
-    "col": 3,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 3,
+        "line": 22,
+      },
+    },
     "type": "call",
     "val": "item",
   },
   Object {
-    "col": 8,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 8,
+        "line": 22,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 9,
+        "line": 22,
+      },
+    },
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
     "val": "\'/contact\'",
   },
   Object {
-    "col": 24,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 25,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 24,
+        "line": 22,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 26,
-    "line": 22,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 26,
+        "line": 22,
+      },
+    },
     "type": "text",
     "val": "Contact",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag.interpolation.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -16648,96 +41137,240 @@ exports[`test tag-blocks.pug 1`] = `
 Array [
   Object {
     "buffer": true,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 42,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "comment",
     "val": " we should not get blocks within blocks",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "div",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "We have sent an e-mail to ",
   },
   Object {
-    "col": 31,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 31,
+        "line": 3,
+      },
+    },
     "type": "start-pug-interpolation",
   },
   Object {
-    "col": 33,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 33,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "strong",
   },
   Object {
     "buffer": true,
-    "col": 39,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 57,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 39,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "this.props.email",
   },
   Object {
-    "col": 57,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 58,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 57,
+        "line": 3,
+      },
+    },
     "type": "end-pug-interpolation",
   },
   Object {
-    "col": 58,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 96,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 58,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": ".  Please click the link in the e-mail",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": true,
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "\'  \'",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 36,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "to confirm your e-mail address.",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tag-blocks.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -16746,345 +41379,885 @@ Array [
 exports[`test tags.self-closing.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 16,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 16,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 16,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 16,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 17,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 17,
+        "line": 6,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 7,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "tag",
     "val": "foo",
   },
   Object {
-    "col": 6,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 8,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 7,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 8,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 16,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 16,
+        "line": 8,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 18,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 19,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 18,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 11,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 11,
+        "line": 9,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 10,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 11,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 11,
+        "line": 10,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 12,
+        "line": 10,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 21,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 21,
+        "line": 10,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 22,
+        "line": 10,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 11,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 12,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 12,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 12,
+      },
+    },
     "type": "interpolation",
     "val": "\'foo\'",
   },
   Object {
-    "col": 11,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 11,
+        "line": 12,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 12,
+        "line": 12,
+      },
+    },
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
     "val": "\'baz\'",
   },
   Object {
-    "col": 21,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 21,
+        "line": 12,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 23,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 24,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 23,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "/",
   },
   Object {
-    "col": 1,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 13,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 13,
+    "loc": Object {
+      "end": Object {
+        "column": 41,
+        "line": 13,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 13,
+      },
+    },
     "type": "comment",
     "val": " can have a single space after them",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 6,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 6,
+        "line": 14,
+      },
+    },
     "type": "text",
     "val": " ",
   },
   Object {
-    "col": 1,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 15,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "comment",
     "val": " can have lots of white space after them",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 16,
+      },
+    },
     "type": "tag",
     "val": "img",
   },
   Object {
-    "col": 7,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 7,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "   ",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 3,
+        "line": 17,
+      },
+    },
     "type": "interpolation",
     "val": "
     \'foo\'
   ",
   },
   Object {
-    "col": 4,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 4,
+        "line": 19,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/tags.self-closing.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17093,156 +42266,399 @@ Array [
 exports[`test template.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 30,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 30,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "h2",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "{{title}}",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "{{description}}",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 7,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 7,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text/x-template\'",
   },
   Object {
-    "col": 30,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 30,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 31,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 31,
+        "line": 6,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 32,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 32,
+        "line": 6,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 7,
+      },
+    },
     "type": "text",
     "val": "article",
   },
   Object {
-    "col": 1,
-    "line": 8,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "  h2 {{title}}",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 3,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "  p {{description}}",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 22,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/template.pug",
+      "start": Object {
+        "column": 22,
+        "line": 9,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17251,501 +42667,1320 @@ Array [
 exports[`test text.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "option",
   },
   Object {
-    "col": 7,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 7,
+        "line": 1,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 8,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 8,
+        "line": 1,
+      },
+    },
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
     "val": "\'\'",
   },
   Object {
-    "col": 16,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 16,
+        "line": 1,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 18,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 34,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 18,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "-- (selected) --",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 5,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 1,
-    "line": 7,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 7,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 7,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 7,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 1,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 8,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 8,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 8,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 8,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 9,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 9,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 9,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 9,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 9,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 10,
-    "type": "newline",
-  },
-  Object {
-    "col": 4,
-    "line": 10,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 10,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 10,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 10,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 11,
-    "type": "newline",
-  },
-  Object {
-    "col": 4,
-    "line": 11,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 11,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 11,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 11,
+      },
+    },
     "type": "text",
     "val": " ",
   },
   Object {
-    "col": 1,
-    "line": 12,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 12,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 12,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 12,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 12,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 14,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 14,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 2,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 14,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 3,
-    "line": 14,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 14,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 14,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 15,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 15,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 15,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 16,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 16,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 16,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 16,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 17,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 17,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 17,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 17,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 18,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 18,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 18,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 18,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 18,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 19,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 19,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 19,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 19,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 20,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 20,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 21,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 21,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 1,
-    "line": 23,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 2,
-    "line": 23,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 23,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 24,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 24,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 24,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 25,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 25,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 25,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 25,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 26,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 26,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 26,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 26,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 1,
-    "line": 27,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 27,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 27,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 27,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 27,
+      },
+    },
     "type": "text",
     "val": "bar",
   },
   Object {
-    "col": 1,
-    "line": 28,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 28,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 28,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 28,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 28,
+      },
+    },
     "type": "text",
     "val": "baz",
   },
   Object {
-    "col": 1,
-    "line": 29,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 29,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 29,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 29,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 30,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 30,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 30,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 30,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 1,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 31,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 5,
-    "line": 31,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 31,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 31,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 32,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 32,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 32,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 32,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 32,
+      },
+    },
     "type": "text",
     "val": "  bar",
   },
   Object {
-    "col": 1,
-    "line": 33,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 33,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 33,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 33,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 33,
+      },
+    },
     "type": "text",
     "val": "    baz",
   },
   Object {
-    "col": 1,
-    "line": 34,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 34,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 34,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 34,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 34,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 1,
-    "line": 36,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 36,
+      },
+    },
     "type": "tag",
     "val": "pre",
   },
   Object {
-    "col": 4,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 36,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 5,
-    "line": 36,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 36,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 5,
+        "line": 36,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 37,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 37,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 37,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 38,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 38,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 38,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 38,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 38,
+      },
+    },
     "type": "text",
     "val": "  bar",
   },
   Object {
-    "col": 1,
-    "line": 39,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 39,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 39,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 39,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 39,
+      },
+    },
     "type": "text",
     "val": "    baz",
   },
   Object {
-    "col": 1,
-    "line": 40,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 40,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 40,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 40,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 40,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 1,
-    "line": 41,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "text",
     "val": "",
   },
   Object {
-    "col": 3,
-    "line": 41,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 41,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 41,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 1,
-    "line": 42,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 42,
+      },
+    },
     "type": "dot",
   },
   Object {
-    "col": 2,
-    "line": 42,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 42,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 2,
+        "line": 42,
+      },
+    },
     "type": "start-pipeless-text",
   },
   Object {
-    "col": 3,
-    "line": 43,
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 43,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 43,
+      },
+    },
     "type": "text",
     "val": "foo",
   },
   Object {
-    "col": 1,
-    "line": 44,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 44,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 44,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 44,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 44,
+      },
+    },
     "type": "text",
     "val": "  bar",
   },
   Object {
-    "col": 1,
-    "line": 45,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 45,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 45,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 45,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 45,
+      },
+    },
     "type": "text",
     "val": "    baz",
   },
   Object {
-    "col": 1,
-    "line": 46,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 1,
+        "line": 46,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 3,
+        "line": 46,
+      },
+    },
     "type": "text",
     "val": ".",
   },
   Object {
-    "col": 4,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 46,
+      },
+    },
     "type": "end-pipeless-text",
   },
   Object {
-    "col": 4,
-    "line": 46,
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 46,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text.pug",
+      "start": Object {
+        "column": 4,
+        "line": 46,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17754,123 +43989,303 @@ Array [
 exports[`test text-block.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "label",
   },
   Object {
-    "col": 7,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 7,
+        "line": 2,
+      },
+    },
     "type": "text",
     "val": "Username:",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 8,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 22,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'user[name]\'",
   },
   Object {
-    "col": 39,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 39,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "label",
   },
   Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 16,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "text",
     "val": "Password:",
   },
   Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 3,
+        "line": 6,
+      },
+    },
     "type": "tag",
     "val": "input",
   },
   Object {
-    "col": 8,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 8,
+        "line": 6,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 9,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 9,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
     "val": "\'text\'",
   },
   Object {
-    "col": 22,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 39,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 22,
+        "line": 6,
+      },
+    },
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
     "val": "\'user[pass]\'",
   },
   Object {
-    "col": 39,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 39,
+        "line": 6,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 40,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 40,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 40,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 40,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/text-block.pug",
+      "start": Object {
+        "column": 40,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17879,25 +44294,61 @@ Array [
 exports[`test utf8bom.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "p",
   },
   Object {
-    "col": 3,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 3,
+        "line": 1,
+      },
+    },
     "type": "text",
     "val": "\"foo\"",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/utf8bom.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17907,65 +44358,155 @@ exports[`test vars.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 18,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var foo = \'bar\'",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "newline",
   },
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var list = [1,2,3]",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 2,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "a",
   },
   Object {
-    "col": 2,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 2,
+        "line": 3,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
     "val": "list",
   },
   Object {
-    "col": 15,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 21,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 15,
+        "line": 3,
+      },
+    },
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
     "val": "foo",
   },
   Object {
-    "col": 21,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 21,
+        "line": 3,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 22,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 22,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/vars.pug",
+      "start": Object {
+        "column": 22,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -17984,81 +44525,198 @@ exports[`test while.pug 1`] = `
 Array [
   Object {
     "buffer": false,
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "var x = 1;",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "ul",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "while",
     "val": "x < 10",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
     "buffer": false,
-    "col": 5,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 5,
+        "line": 4,
+      },
+    },
     "mustEscape": false,
     "type": "code",
     "val": "x++;",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "li",
   },
   Object {
     "buffer": true,
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "type": "code",
     "val": "x",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/while.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18076,65 +44734,164 @@ Object {
 exports[`test xml.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "doctype",
     "val": "xml",
   },
   Object {
-    "col": 1,
-    "line": 2,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "category",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "term",
     "type": "attribute",
     "val": "\'some term\'",
   },
   Object {
-    "col": 26,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 26,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 27,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 27,
+        "line": 2,
+      },
+    },
     "type": "slash",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "tag",
     "val": "link",
   },
   Object {
-    "col": 6,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 6,
+        "line": 3,
+      },
+    },
     "type": "text",
     "val": "http://google.com",
   },
   Object {
-    "col": 23,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 23,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/xml.pug",
+      "start": Object {
+        "column": 23,
+        "line": 3,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18143,117 +44900,297 @@ Array [
 exports[`test yield.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "yield-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/caustic.js\'",
   },
   Object {
-    "col": 31,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 31,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/app.js\'",
   },
   Object {
-    "col": 27,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 27,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18262,117 +45199,297 @@ Array [
 exports[`test yield-before-conditional.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 46,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "yield-before-conditional-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 7,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 7,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 13,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 14,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/caustic.js\'",
   },
   Object {
-    "col": 31,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 31,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 7,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 13,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 7,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 13,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 13,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 14,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 14,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/app.js\'",
   },
   Object {
-    "col": 27,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 27,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 5,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18381,105 +45498,267 @@ Array [
 exports[`test yield-before-conditional-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.js\'",
   },
   Object {
-    "col": 26,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "if",
     "val": "false",
   },
   Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 11,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 5,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 11,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 11,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 12,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 12,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.ui.js\'",
   },
   Object {
-    "col": 31,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 32,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 31,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 3,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-before-conditional-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18488,88 +45767,223 @@ Array [
 exports[`test yield-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 2,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 2,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.js\'",
   },
   Object {
-    "col": 26,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 2,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 3,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 3,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 1,
-    "line": 4,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.ui.js\'",
   },
   Object {
-    "col": 29,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 29,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18578,70 +45992,178 @@ Array [
 exports[`test yield-title.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "html",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "body",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 12,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "include",
   },
   Object {
-    "col": 13,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 33,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 13,
+        "line": 3,
+      },
+    },
     "type": "path",
     "val": "yield-title-head.pug",
   },
   Object {
-    "col": 1,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
     "type": "indent",
     "val": 6,
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 17,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "text",
     "val": "My Title",
   },
   Object {
-    "col": 5,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
     "type": "eos",
   },
 ]
@@ -18650,100 +46172,253 @@ Array [
 exports[`test yield-title-head.pug 1`] = `
 Array [
   Object {
-    "col": 1,
-    "line": 1,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 1,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 1,
+      },
+    },
     "type": "tag",
     "val": "head",
   },
   Object {
-    "col": 1,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 2,
+      },
+    },
     "type": "indent",
     "val": 2,
   },
   Object {
-    "col": 3,
-    "line": 2,
+    "loc": Object {
+      "end": Object {
+        "column": 8,
+        "line": 2,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 2,
+      },
+    },
     "type": "tag",
     "val": "title",
   },
   Object {
-    "col": 1,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 3,
+      },
+    },
     "type": "indent",
     "val": 4,
   },
   Object {
-    "col": 5,
-    "line": 3,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 3,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 5,
+        "line": 3,
+      },
+    },
     "type": "yield",
   },
   Object {
-    "col": 3,
-    "line": 4,
-    "type": "outdent",
-  },
-  Object {
-    "col": 3,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 4,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 4,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 4,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 26,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 4,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.js\'",
   },
   Object {
-    "col": 26,
-    "line": 4,
+    "loc": Object {
+      "end": Object {
+        "column": 27,
+        "line": 4,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 26,
+        "line": 4,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 5,
-    "type": "newline",
-  },
-  Object {
-    "col": 3,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 3,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 5,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 9,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 3,
+        "line": 5,
+      },
+    },
     "type": "tag",
     "val": "script",
   },
   Object {
-    "col": 9,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 10,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 9,
+        "line": 5,
+      },
+    },
     "type": "start-attributes",
   },
   Object {
-    "col": 10,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 10,
+        "line": 5,
+      },
+    },
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
     "val": "\'/jquery.ui.js\'",
   },
   Object {
-    "col": 29,
-    "line": 5,
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 5,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 29,
+        "line": 5,
+      },
+    },
     "type": "end-attributes",
   },
   Object {
-    "col": 1,
-    "line": 6,
-    "type": "outdent",
-  },
-  Object {
-    "col": 1,
-    "line": 6,
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
+    "type": "outdent",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 6,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/yield-title-head.pug",
+      "start": Object {
+        "column": 1,
+        "line": 6,
+      },
+    },
     "type": "eos",
   },
 ]
diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index fe93b92e9..9036ca3bf 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -51,8 +51,8 @@ Parser.prototype = {
 
   error: function (code, message, token) {
     var err = error(code, message, {
-      line: token.line,
-      column: token.col,
+      line: token.loc.start.line,
+      column: token.loc.start.column,
       filename: this.filename,
       src: this.src
     });
@@ -229,7 +229,7 @@ Parser.prototype = {
       case 'start-pug-interpolation':
         return this.parseText({block: true});
       case 'text-html':
-        return this.initBlock(this.peek().line, this.parseTextHtml());
+        return this.initBlock(this.peek().loc.start.line, this.parseTextHtml());
       case 'dot':
         return this.parseDot();
       case 'each':
@@ -250,11 +250,11 @@ Parser.prototype = {
         return this.parseYield();
       case 'id':
       case 'class':
+        if (!this.peek().loc.start) debugger;
         this.tokens.defer({
           type: 'tag',
           val: 'div',
-          line: this.peek().line,
-          col: this.peek().col,
+          loc: this.peek().loc,
           filename: this.filename
         });
         return this.parseExpr();
@@ -276,7 +276,7 @@ Parser.prototype = {
 
   parseText: function(options){
     var tags = [];
-    var lineno = this.peek().line;
+    var lineno = this.peek().loc.start.line;
     var nextTok = this.peek();
     loop:
       while (true) {
@@ -286,8 +286,8 @@ Parser.prototype = {
             tags.push({
               type: 'Text',
               val: tok.val,
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename
             });
             break;
@@ -299,8 +299,8 @@ Parser.prototype = {
               buffer: tok.buffer,
               mustEscape: tok.mustEscape !== false,
               isInline: true,
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename
             });
             break;
@@ -312,8 +312,8 @@ Parser.prototype = {
               tags.push({
                 type: 'Text',
                 val: '\n',
-                line: tok.line,
-                column: tok.col,
+                line: tok.loc.start.line,
+                column: tok.loc.start.column,
                 filename: this.filename
               });
             }
@@ -347,8 +347,8 @@ loop:
               type: 'Text',
               val: text.val,
               filename: this.filename,
-              line: text.line,
-              column: text.col,
+              line: text.loc.start.line,
+              column: text.loc.start.column,
               isHtml: true
             };
             nodes.push(currentNode);
@@ -395,7 +395,7 @@ loop:
     var tok = this.accept(':');
     if (tok) {
       var expr = this.parseExpr();
-      return expr.type === 'Block' ? expr : this.initBlock(tok.line, [expr]);
+      return expr.type === 'Block' ? expr : this.initBlock(tok.loc.start.line, [expr]);
     } else {
       return this.block();
     }
@@ -410,12 +410,12 @@ loop:
     var node = {
       type: 'Case',
       expr: tok.val,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
-    var block = this.emptyBlock(tok.line + 1);
+    var block = this.emptyBlock(tok.loc.start.line + 1);
     this.expect('indent');
     while ('outdent' != this.peek().type) {
       switch (this.peek().type) {
@@ -455,8 +455,8 @@ loop:
         expr: tok.val,
         block: this.parseBlockExpansion(),
         debug: false,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     } else {
@@ -464,8 +464,8 @@ loop:
         type: 'When',
         expr: tok.val,
         debug: false,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     }
@@ -482,8 +482,8 @@ loop:
       expr: 'default',
       block: this.parseBlockExpansion(),
       debug: false,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -501,8 +501,8 @@ loop:
       buffer: tok.buffer,
       mustEscape: tok.mustEscape !== false,
       isInline: !!noBlock,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
     // todo: why is this here?  It seems like a hacky workaround
@@ -528,10 +528,10 @@ loop:
     var node = {
       type: 'Conditional',
       test: tok.val,
-      consequent: this.emptyBlock(tok.line),
+      consequent: this.emptyBlock(tok.loc.start.line),
       alternate: null,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -550,10 +550,10 @@ loop:
           currentNode.alternate = {
             type: 'Conditional',
             test: tok.val,
-            consequent: this.emptyBlock(tok.line),
+            consequent: this.emptyBlock(tok.loc.start.line),
             alternate: null,
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           }
         );
@@ -578,8 +578,8 @@ loop:
     var node = {
       type: 'While',
       test: tok.val,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -587,7 +587,7 @@ loop:
     if ('indent' == this.peek().type) {
       node.block = this.block();
     } else {
-      node.block = this.emptyBlock(tok.line);
+      node.block = this.emptyBlock(tok.loc.start.line);
     }
 
     return node;
@@ -599,8 +599,8 @@ loop:
 
   parseBlockCode: function(){
     var tok = this.expect('blockcode');
-    var line = tok.line;
-    var column = tok.col;
+    var line = tok.loc.start.line;
+    var column = tok.loc.start.column;
     var body = this.peek();
     var text = '';
     if (body.type === 'start-pipeless-text') {
@@ -649,8 +649,8 @@ loop:
         val: tok.val,
         block: block,
         buffer: tok.buffer,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     } else {
@@ -658,8 +658,8 @@ loop:
         type: 'Comment',
         val: tok.val,
         buffer: tok.buffer,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
     }
@@ -674,8 +674,8 @@ loop:
     return {
       type: 'Doctype',
       val: tok.val,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -692,8 +692,8 @@ loop:
       type: 'IncludeFilter',
       name: tok.val,
       attrs: attrs,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -712,19 +712,19 @@ loop:
 
     if (this.peek().type === 'text') {
       var textToken = this.advance();
-      block = this.initBlock(textToken.line, [
+      block = this.initBlock(textToken.loc.start.line, [
         {
           type: 'Text',
           val: textToken.val,
-          line: textToken.line,
-          column: textToken.col,
+          line: textToken.loc.start.line,
+          column: textToken.loc.start.column,
           filename: this.filename
         }
       ]);
     } else if (this.peek().type === 'filter') {
-      block = this.initBlock(tok.line, [this.parseFilter()]);
+      block = this.initBlock(tok.loc.start.line, [this.parseFilter()]);
     } else {
-      block = this.parseTextBlock() || this.emptyBlock(tok.line);
+      block = this.parseTextBlock() || this.emptyBlock(tok.loc.start.line);
     }
 
     return {
@@ -732,8 +732,8 @@ loop:
       name: tok.val,
       block: block,
       attrs: attrs,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -750,8 +750,8 @@ loop:
       val: tok.val,
       key: tok.key,
       block: this.block(),
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
     if (this.peek().type == 'else') {
@@ -773,12 +773,12 @@ loop:
       file: {
         type: 'FileReference',
         path: path.val.trim(),
-        line: path.line,
-        column: path.col,
+        line: path.loc.start.line,
+        column: path.loc.start.column,
         filename: this.filename
       },
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -790,12 +790,12 @@ loop:
   parseBlock: function(){
     var tok = this.expect('block');
 
-    var node = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.line);
+    var node = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
     node.type = 'NamedBlock';
     node.name = tok.val.trim();
     node.mode = tok.mode;
-    node.line = tok.line;
-    node.column = tok.col;
+    node.line = tok.loc.start.line;
+    node.column = tok.loc.start.column;
 
     return node;
   },
@@ -807,8 +807,8 @@ loop:
     }
     return {
       type: 'MixinBlock',
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -817,8 +817,8 @@ loop:
     var tok = this.expect('yield');
     return {
       type: 'YieldBlock',
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
   },
@@ -835,8 +835,8 @@ loop:
         type: 'FileReference',
         filename: this.filename
       },
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
     var filters = [];
@@ -846,14 +846,14 @@ loop:
     var path = this.expect('path');
 
     node.file.path = path.val.trim();
-    node.file.line = path.line;
-    node.file.column = path.col;
+    node.file.line = path.loc.start.line;
+    node.file.column = path.loc.start.column;
 
     if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !filters.length) {
-      node.block = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.line);
+      node.block = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
       if (/\.jade$/.test(node.file.path)) {
         console.warn(
-          this.filename + ', line ' + tok.line +
+          this.filename + ', line ' + tok.loc.start.line +
           ':\nThe .jade extension is deprecated, use .pug for "' + node.file.path +'".'
         );
       }
@@ -879,12 +879,12 @@ loop:
       type: 'Mixin',
       name: name,
       args: args,
-      block: this.emptyBlock(tok.line),
+      block: this.emptyBlock(tok.loc.start.line),
       call: true,
       attrs: [],
       attributeBlocks: [],
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -914,8 +914,8 @@ loop:
         args: args,
         block: this.block(),
         call: false,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename
       };
       this.inMixin--;
@@ -932,7 +932,7 @@ loop:
   parseTextBlock: function(){
     var tok = this.accept('start-pipeless-text');
     if (!tok) return;
-    var block = this.emptyBlock(tok.line);
+    var block = this.emptyBlock(tok.loc.start.line);
     while (this.peek().type !== 'end-pipeless-text') {
       var tok = this.advance();
       switch (tok.type) {
@@ -940,8 +940,8 @@ loop:
           block.nodes.push({
             type: 'Text',
             val: tok.val,
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           });
           break;
@@ -949,8 +949,8 @@ loop:
           block.nodes.push({
             type: 'Text',
             val: '\n',
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           });
           break;
@@ -965,8 +965,8 @@ loop:
             buffer: tok.buffer,
             mustEscape: tok.mustEscape !== false,
             isInline: true,
-            line: tok.line,
-            column: tok.col,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
             filename: this.filename
           });
           break;
@@ -986,7 +986,7 @@ loop:
 
   block: function(){
     var tok = this.expect('indent');
-    var block = this.emptyBlock(tok.line);
+    var block = this.emptyBlock(tok.loc.start.line);
     while ('outdent' != this.peek().type) {
       if ('newline' == this.peek().type) {
         this.advance();
@@ -1015,12 +1015,12 @@ loop:
       type: 'InterpolatedTag',
       expr: tok.val,
       selfClosing: false,
-      block: this.emptyBlock(tok.line),
+      block: this.emptyBlock(tok.loc.start.line),
       attrs: [],
       attributeBlocks: [],
       isInline: false,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -1037,12 +1037,12 @@ loop:
       type: 'Tag',
       name: tok.val,
       selfClosing: false,
-      block: this.emptyBlock(tok.line),
+      block: this.emptyBlock(tok.loc.start.line),
       attrs: [],
       attributeBlocks: [],
       isInline: inlineTags.indexOf(tok.val) !== -1,
-      line: tok.line,
-      column: tok.col,
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
       filename: this.filename
     };
 
@@ -1073,15 +1073,15 @@ loop:
             tag.attrs.push({
               name: tok.type,
               val: "'" + tok.val + "'",
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename,
               mustEscape: false
             });
             continue;
           case 'start-attributes':
             if (seenAttrs) {
-              console.warn(this.filename + ', line ' + this.peek().line + ':\nYou should not have pug tags with multiple attributes.');
+              console.warn(this.filename + ', line ' + this.peek().loc.start.line + ':\nYou should not have pug tags with multiple attributes.');
             }
             seenAttrs = true;
             tag.attrs = tag.attrs.concat(this.attrs(attributeNames));
@@ -1091,8 +1091,8 @@ loop:
             tag.attributeBlocks.push({
               type: 'AttributeBlock',
               val: tok.val,
-              line: tok.line,
-              column: tok.col,
+              line: tok.loc.start.line,
+              column: tok.loc.start.column,
               filename: this.filename
             });
             break;
@@ -1178,8 +1178,8 @@ loop:
       attrs.push({
         name: tok.name,
         val: tok.val,
-        line: tok.line,
-        column: tok.col,
+        line: tok.loc.start.line,
+        column: tok.loc.start.column,
         filename: this.filename,
         mustEscape: tok.mustEscape !== false
       });
@@ -1189,4 +1189,4 @@ loop:
     this.expect('end-attributes');
     return attrs;
   }
-};
+};
\ No newline at end of file
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index f5e7c5ee2..54a141c98 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -588,7 +588,7 @@ Object {
           "column": 8,
           "filename": "attrs.tokens.json",
           "line": 3,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "bar",
           "val": true,
         },
@@ -596,7 +596,7 @@ Object {
           "column": 13,
           "filename": "attrs.tokens.json",
           "line": 3,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "baz",
           "val": true,
         },
@@ -705,7 +705,7 @@ Object {
                 "column": 23,
                 "filename": "attrs.tokens.json",
                 "line": 7,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "selected",
                 "val": true,
               },
@@ -928,7 +928,7 @@ Object {
           "column": 7,
           "filename": "attrs.tokens.json",
           "line": 14,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "bar",
           "val": true,
         },
@@ -936,7 +936,7 @@ Object {
           "column": 11,
           "filename": "attrs.tokens.json",
           "line": 14,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "baz",
           "val": true,
         },
@@ -1045,7 +1045,7 @@ Object {
                 "column": 22,
                 "filename": "attrs.tokens.json",
                 "line": 18,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "selected",
                 "val": true,
               },
@@ -1244,7 +1244,7 @@ Object {
           "column": 5,
           "filename": "attrs.tokens.json",
           "line": 26,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1278,7 +1278,7 @@ Object {
           "column": 5,
           "filename": "attrs.tokens.json",
           "line": 28,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1312,7 +1312,7 @@ Object {
           "column": 3,
           "filename": "attrs.tokens.json",
           "line": 30,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1346,7 +1346,7 @@ Object {
           "column": 4,
           "filename": "attrs.tokens.json",
           "line": 32,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1380,7 +1380,7 @@ Object {
           "column": 3,
           "filename": "attrs.tokens.json",
           "line": 34,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1414,7 +1414,7 @@ Object {
           "column": 5,
           "filename": "attrs.tokens.json",
           "line": 36,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "def",
           "val": true,
         },
@@ -1480,7 +1480,7 @@ Object {
           "val": "\'foo\'",
         },
         Object {
-          "column": 14,
+          "column": 13,
           "filename": "attrs.tokens.json",
           "line": 42,
           "mustEscape": true,
@@ -1514,7 +1514,7 @@ Object {
           "val": "\'foo\'",
         },
         Object {
-          "column": 14,
+          "column": 13,
           "filename": "attrs.tokens.json",
           "line": 43,
           "mustEscape": true,
@@ -3055,6 +3055,110 @@ Object {
                   "line": 9,
                   "type": "Case",
                 },
+                Object {
+                  "buffer": false,
+                  "column": 5,
+                  "filename": "case.tokens.json",
+                  "isInline": false,
+                  "line": 16,
+                  "mustEscape": false,
+                  "type": "Code",
+                  "val": "var friend = \'Tim:G\'",
+                },
+                Object {
+                  "block": Object {
+                    "filename": "case.tokens.json",
+                    "line": 18,
+                    "nodes": Array [
+                      Object {
+                        "block": Object {
+                          "filename": "case.tokens.json",
+                          "line": 18,
+                          "nodes": Array [
+                            Object {
+                              "attributeBlocks": Array [],
+                              "attrs": Array [],
+                              "block": Object {
+                                "filename": "case.tokens.json",
+                                "line": 18,
+                                "nodes": Array [
+                                  Object {
+                                    "column": 26,
+                                    "filename": "case.tokens.json",
+                                    "line": 18,
+                                    "type": "Text",
+                                    "val": "Friend is a string",
+                                  },
+                                ],
+                                "type": "Block",
+                              },
+                              "column": 24,
+                              "filename": "case.tokens.json",
+                              "isInline": false,
+                              "line": 18,
+                              "name": "p",
+                              "selfClosing": false,
+                              "type": "Tag",
+                            },
+                          ],
+                          "type": "Block",
+                        },
+                        "column": 7,
+                        "debug": false,
+                        "expr": "\'Tim:G\'",
+                        "filename": "case.tokens.json",
+                        "line": 18,
+                        "type": "When",
+                      },
+                      Object {
+                        "block": Object {
+                          "filename": "case.tokens.json",
+                          "line": 19,
+                          "nodes": Array [
+                            Object {
+                              "attributeBlocks": Array [],
+                              "attrs": Array [],
+                              "block": Object {
+                                "filename": "case.tokens.json",
+                                "line": 19,
+                                "nodes": Array [
+                                  Object {
+                                    "column": 26,
+                                    "filename": "case.tokens.json",
+                                    "line": 19,
+                                    "type": "Text",
+                                    "val": "Friend is an object",
+                                  },
+                                ],
+                                "type": "Block",
+                              },
+                              "column": 24,
+                              "filename": "case.tokens.json",
+                              "isInline": false,
+                              "line": 19,
+                              "name": "p",
+                              "selfClosing": false,
+                              "type": "Tag",
+                            },
+                          ],
+                          "type": "Block",
+                        },
+                        "column": 7,
+                        "debug": false,
+                        "expr": "{tim: \'g\'}",
+                        "filename": "case.tokens.json",
+                        "line": 19,
+                        "type": "When",
+                      },
+                    ],
+                    "type": "Block",
+                  },
+                  "column": 5,
+                  "expr": "friend",
+                  "filename": "case.tokens.json",
+                  "line": 17,
+                  "type": "Case",
+                },
               ],
               "type": "Block",
             },
@@ -3414,6 +3518,58 @@ Object {
       "selfClosing": false,
       "type": "Tag",
     },
+    Object {
+      "attributeBlocks": Array [],
+      "attrs": Array [
+        Object {
+          "column": 2,
+          "filename": "classes.tokens.json",
+          "line": 13,
+          "mustEscape": false,
+          "name": "class",
+          "val": "\'-foo\'",
+        },
+      ],
+      "block": Object {
+        "filename": "classes.tokens.json",
+        "line": 13,
+        "nodes": Array [],
+        "type": "Block",
+      },
+      "column": 1,
+      "filename": "classes.tokens.json",
+      "isInline": true,
+      "line": 13,
+      "name": "a",
+      "selfClosing": false,
+      "type": "Tag",
+    },
+    Object {
+      "attributeBlocks": Array [],
+      "attrs": Array [
+        Object {
+          "column": 2,
+          "filename": "classes.tokens.json",
+          "line": 14,
+          "mustEscape": false,
+          "name": "class",
+          "val": "\'3foo\'",
+        },
+      ],
+      "block": Object {
+        "filename": "classes.tokens.json",
+        "line": 14,
+        "nodes": Array [],
+        "type": "Block",
+      },
+      "column": 1,
+      "filename": "classes.tokens.json",
+      "isInline": true,
+      "line": 14,
+      "name": "a",
+      "selfClosing": false,
+      "type": "Tag",
+    },
   ],
   "type": "Block",
 }
@@ -5044,7 +5200,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.source.tokens.json",
             "line": 3,
             "type": "Text",
@@ -5258,7 +5414,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 12,
             "type": "Text",
@@ -5310,7 +5466,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 16,
             "type": "Text",
@@ -5377,7 +5533,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 21,
             "type": "Text",
@@ -5444,7 +5600,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "comments.tokens.json",
             "line": 26,
             "type": "Text",
@@ -6942,7 +7098,7 @@ Object {
 ",
                       },
                       Object {
-                        "column": 7,
+                        "column": 1,
                         "filename": "filters.custom.tokens.json",
                         "line": 6,
                         "type": "Text",
@@ -7889,6 +8045,89 @@ Object {
 }
 `;
 
+exports[`test filters.verbatim.tokens.json 1`] = `
+Object {
+  "filename": "filters.verbatim.tokens.json",
+  "line": 0,
+  "nodes": Array [
+    Object {
+      "attributeBlocks": Array [],
+      "attrs": Array [],
+      "block": Object {
+        "filename": "filters.verbatim.tokens.json",
+        "line": 1,
+        "nodes": Array [
+          Object {
+            "attributeBlocks": Array [],
+            "attrs": Array [],
+            "block": Object {
+              "filename": "filters.verbatim.tokens.json",
+              "line": 2,
+              "nodes": Array [
+                Object {
+                  "attrs": Array [],
+                  "block": Object {
+                    "filename": "filters.verbatim.tokens.json",
+                    "line": 3,
+                    "nodes": Array [
+                      Object {
+                        "column": 5,
+                        "filename": "filters.verbatim.tokens.json",
+                        "line": 4,
+                        "type": "Text",
+                        "val": "filters are applied at compile time",
+                      },
+                      Object {
+                        "column": 1,
+                        "filename": "filters.verbatim.tokens.json",
+                        "line": 5,
+                        "type": "Text",
+                        "val": "
+",
+                      },
+                      Object {
+                        "column": 5,
+                        "filename": "filters.verbatim.tokens.json",
+                        "line": 5,
+                        "type": "Text",
+                        "val": "with no #[b interpolation] at #{all}",
+                      },
+                    ],
+                    "type": "Block",
+                  },
+                  "column": 3,
+                  "filename": "filters.verbatim.tokens.json",
+                  "line": 3,
+                  "name": "verbatim",
+                  "type": "Filter",
+                },
+              ],
+              "type": "Block",
+            },
+            "column": 2,
+            "filename": "filters.verbatim.tokens.json",
+            "isInline": false,
+            "line": 2,
+            "name": "div",
+            "selfClosing": false,
+            "type": "Tag",
+          },
+        ],
+        "type": "Block",
+      },
+      "column": 1,
+      "filename": "filters.verbatim.tokens.json",
+      "isInline": false,
+      "line": 1,
+      "name": "html",
+      "selfClosing": false,
+      "type": "Tag",
+    },
+  ],
+  "type": "Block",
+}
+`;
+
 exports[`test filters-empty.tokens.json 1`] = `
 Object {
   "filename": "filters-empty.tokens.json",
@@ -8114,7 +8353,7 @@ Object {
           "column": 24,
           "filename": "html5.tokens.json",
           "line": 2,
-          "mustEscape": false,
+          "mustEscape": true,
           "name": "checked",
           "val": true,
         },
@@ -9981,7 +10220,7 @@ Object {
     },
     Object {
       "buffer": true,
-      "column": 1,
+      "column": 15,
       "filename": "inline-block-comment.tokens.json",
       "line": 1,
       "type": "Comment",
@@ -9998,7 +10237,7 @@ Object {
     },
     Object {
       "buffer": true,
-      "column": 1,
+      "column": 16,
       "filename": "inline-block-comment.tokens.json",
       "line": 2,
       "type": "Comment",
@@ -10015,7 +10254,7 @@ Object {
     },
     Object {
       "buffer": true,
-      "column": 1,
+      "column": 17,
       "filename": "inline-block-comment.tokens.json",
       "line": 3,
       "type": "Comment",
@@ -10255,7 +10494,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "inline-tag.tokens.json",
             "line": 9,
             "type": "Text",
@@ -12494,7 +12733,7 @@ Object {
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
-          "column": 31,
+          "column": 30,
           "filename": "mixin.attrs.tokens.json",
           "line": 41,
           "mustEscape": true,
@@ -15552,7 +15791,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "pipeless-filters.tokens.json",
             "line": 3,
             "type": "Text",
@@ -15730,7 +15969,7 @@ Object {
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "pre.tokens.json",
             "line": 5,
             "type": "Text",
@@ -16572,7 +16811,7 @@ Object {
                 "column": 25,
                 "filename": "source.tokens.json",
                 "line": 2,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "autobuffer",
                 "val": true,
               },
@@ -16580,7 +16819,7 @@ Object {
                 "column": 37,
                 "filename": "source.tokens.json",
                 "line": 2,
-                "mustEscape": false,
+                "mustEscape": true,
                 "name": "controls",
                 "val": true,
               },
@@ -18179,10 +18418,40 @@ Object {
 ",
           },
           Object {
-            "column": 5,
+            "column": 4,
             "filename": "text.tokens.json",
             "line": 10,
             "type": "Text",
+            "val": "",
+          },
+          Object {
+            "column": 1,
+            "filename": "text.tokens.json",
+            "line": 11,
+            "type": "Text",
+            "val": "
+",
+          },
+          Object {
+            "column": 4,
+            "filename": "text.tokens.json",
+            "line": 11,
+            "type": "Text",
+            "val": " ",
+          },
+          Object {
+            "column": 1,
+            "filename": "text.tokens.json",
+            "line": 12,
+            "type": "Text",
+            "val": "
+",
+          },
+          Object {
+            "column": 5,
+            "filename": "text.tokens.json",
+            "line": 12,
+            "type": "Text",
             "val": "baz",
           },
         ],
@@ -18201,49 +18470,49 @@ Object {
       "attrs": Array [],
       "block": Object {
         "filename": "text.tokens.json",
-        "line": 12,
+        "line": 14,
         "nodes": Array [
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 13,
+            "line": 15,
             "type": "Text",
             "val": "foo",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 14,
+            "line": 16,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 14,
+            "line": 16,
             "type": "Text",
             "val": "",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 15,
+            "line": 17,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 15,
+            "line": 17,
             "type": "Text",
             "val": "",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 16,
+            "line": 18,
             "type": "Text",
             "val": "
 ",
@@ -18251,14 +18520,14 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 16,
+            "line": 18,
             "type": "Text",
             "val": "bar",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 17,
+            "line": 19,
             "type": "Text",
             "val": "
 ",
@@ -18266,22 +18535,22 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 17,
+            "line": 19,
             "type": "Text",
             "val": "baz",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 18,
+            "line": 20,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 18,
+            "line": 20,
             "type": "Text",
             "val": "",
           },
@@ -18291,7 +18560,7 @@ Object {
       "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
-      "line": 12,
+      "line": 14,
       "name": "p",
       "selfClosing": false,
       "textOnly": true,
@@ -18300,44 +18569,44 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 22,
+      "line": 24,
       "type": "Text",
       "val": "foo",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 23,
+      "line": 25,
       "type": "Text",
       "val": "
 ",
     },
     Object {
-      "column": 3,
+      "column": 1,
       "filename": "text.tokens.json",
-      "line": 23,
+      "line": 25,
       "type": "Text",
       "val": "",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 24,
+      "line": 26,
       "type": "Text",
       "val": "
 ",
     },
     Object {
-      "column": 3,
+      "column": 1,
       "filename": "text.tokens.json",
-      "line": 24,
+      "line": 26,
       "type": "Text",
       "val": "",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 25,
+      "line": 27,
       "type": "Text",
       "val": "
 ",
@@ -18345,14 +18614,14 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 25,
+      "line": 27,
       "type": "Text",
       "val": "bar",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 26,
+      "line": 28,
       "type": "Text",
       "val": "
 ",
@@ -18360,22 +18629,22 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 26,
+      "line": 28,
       "type": "Text",
       "val": "baz",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 27,
+      "line": 29,
       "type": "Text",
       "val": "
 ",
     },
     Object {
-      "column": 3,
+      "column": 1,
       "filename": "text.tokens.json",
-      "line": 27,
+      "line": 29,
       "type": "Text",
       "val": "",
     },
@@ -18384,19 +18653,19 @@ Object {
       "attrs": Array [],
       "block": Object {
         "filename": "text.tokens.json",
-        "line": 28,
+        "line": 30,
         "nodes": Array [
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 29,
+            "line": 31,
             "type": "Text",
             "val": "foo",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 30,
+            "line": 32,
             "type": "Text",
             "val": "
 ",
@@ -18404,14 +18673,14 @@ Object {
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 30,
+            "line": 32,
             "type": "Text",
             "val": "  bar",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 31,
+            "line": 33,
             "type": "Text",
             "val": "
 ",
@@ -18419,14 +18688,14 @@ Object {
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 31,
+            "line": 33,
             "type": "Text",
             "val": "    baz",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 32,
+            "line": 34,
             "type": "Text",
             "val": "
 ",
@@ -18434,7 +18703,7 @@ Object {
           Object {
             "column": 5,
             "filename": "text.tokens.json",
-            "line": 32,
+            "line": 34,
             "type": "Text",
             "val": ".",
           },
@@ -18444,7 +18713,7 @@ Object {
       "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
-      "line": 28,
+      "line": 30,
       "name": "pre",
       "selfClosing": false,
       "type": "Tag",
@@ -18454,19 +18723,19 @@ Object {
       "attrs": Array [],
       "block": Object {
         "filename": "text.tokens.json",
-        "line": 34,
+        "line": 36,
         "nodes": Array [
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 35,
+            "line": 37,
             "type": "Text",
             "val": "foo",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 36,
+            "line": 38,
             "type": "Text",
             "val": "
 ",
@@ -18474,14 +18743,14 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 36,
+            "line": 38,
             "type": "Text",
             "val": "  bar",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 37,
+            "line": 39,
             "type": "Text",
             "val": "
 ",
@@ -18489,14 +18758,14 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 37,
+            "line": 39,
             "type": "Text",
             "val": "    baz",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 38,
+            "line": 40,
             "type": "Text",
             "val": "
 ",
@@ -18504,22 +18773,22 @@ Object {
           Object {
             "column": 3,
             "filename": "text.tokens.json",
-            "line": 38,
+            "line": 40,
             "type": "Text",
             "val": ".",
           },
           Object {
             "column": 1,
             "filename": "text.tokens.json",
-            "line": 39,
+            "line": 41,
             "type": "Text",
             "val": "
 ",
           },
           Object {
-            "column": 3,
+            "column": 1,
             "filename": "text.tokens.json",
-            "line": 39,
+            "line": 41,
             "type": "Text",
             "val": "",
           },
@@ -18529,7 +18798,7 @@ Object {
       "column": 1,
       "filename": "text.tokens.json",
       "isInline": false,
-      "line": 34,
+      "line": 36,
       "name": "pre",
       "selfClosing": false,
       "textOnly": true,
@@ -18538,14 +18807,14 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 41,
+      "line": 43,
       "type": "Text",
       "val": "foo",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 42,
+      "line": 44,
       "type": "Text",
       "val": "
 ",
@@ -18553,46 +18822,24 @@ Object {
     Object {
       "column": 3,
       "filename": "text.tokens.json",
-      "line": 42,
+      "line": 44,
       "type": "Text",
       "val": "  bar",
     },
     Object {
       "column": 1,
       "filename": "text.tokens.json",
-      "line": 43,
-      "type": "Text",
-      "val": "
-",
-    },
-    Object {
-      "column": 3,
-      "filename": "text.tokens.json",
-      "line": 43,
-      "type": "Text",
-      "val": "    baz",
-    },
-    Object {
-      "column": 1,
-      "filename": "text.tokens.json",
-      "line": 44,
+      "line": 45,
       "type": "Text",
       "val": "
 ",
     },
-    Object {
-      "column": 3,
-      "filename": "text.tokens.json",
-      "line": 44,
-      "type": "Text",
-      "val": ".",
-    },
     Object {
       "column": 3,
       "filename": "text.tokens.json",
       "line": 45,
       "type": "Text",
-      "val": "foo",
+      "val": "    baz",
     },
     Object {
       "column": 1,
@@ -18603,14 +18850,11 @@ Object {
 ",
     },
     Object {
-      "buffer": true,
       "column": 3,
       "filename": "text.tokens.json",
-      "isInline": true,
       "line": 46,
-      "mustEscape": true,
-      "type": "Code",
-      "val": "bar",
+      "type": "Text",
+      "val": ".",
     },
   ],
   "type": "Block",
diff --git a/packages/pug-parser/test/cases/attr-es2015.tokens.json b/packages/pug-parser/test/cases/attr-es2015.tokens.json
index 274f22690..8616bc66e 100644
--- a/packages/pug-parser/test/cases/attr-es2015.tokens.json
+++ b/packages/pug-parser/test/cases/attr-es2015.tokens.json
@@ -1,9 +1,9 @@
-{"type":"code","line":1,"col":1,"val":"var avatar = '219b77f9d21de75e81851b6b886057c7'","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"div"}
-{"type":"class","line":3,"col":4,"val":"avatar-div"}
-{"type":"start-attributes","line":3,"col":15}
-{"type":"attribute","line":3,"col":16,"name":"style","val":"`background-image: url(https://www.gravatar.com/avatar/${avatar})`","mustEscape":true}
-{"type":"end-attributes","line":3,"col":88}
-{"type":"newline","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":1,"column":50}},"val":"var avatar = '219b77f9d21de75e81851b6b886057c7'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":4}},"val":"div"}
+{"type":"class","loc":{"start":{"line":3,"column":4},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":15}},"val":"avatar-div"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":15},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":16}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":16},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":88}},"name":"style","mustEscape":true,"val":"`background-image: url(https://www.gravatar.com/avatar/${avatar})`"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":88},"filename":"/cases/attr-es2015.pug","end":{"line":3,"column":89}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/attr-es2015.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs-data.tokens.json b/packages/pug-parser/test/cases/attrs-data.tokens.json
index d81f4772c..8f4ee0245 100644
--- a/packages/pug-parser/test/cases/attrs-data.tokens.json
+++ b/packages/pug-parser/test/cases/attrs-data.tokens.json
@@ -1,33 +1,33 @@
-{"type":"code","line":1,"col":1,"val":"var user = { name: 'tobi' }","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"foo"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"data-user","val":"user","mustEscape":true}
-{"type":"end-attributes","line":2,"col":19}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"foo"}
-{"type":"start-attributes","line":3,"col":4}
-{"type":"attribute","line":3,"col":5,"name":"data-items","val":"[1,2,3]","mustEscape":true}
-{"type":"end-attributes","line":3,"col":23}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"foo"}
-{"type":"start-attributes","line":4,"col":4}
-{"type":"attribute","line":4,"col":5,"name":"data-username","val":"'tobi'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":25}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"foo"}
-{"type":"start-attributes","line":5,"col":4}
-{"type":"attribute","line":5,"col":5,"name":"data-escaped","val":"{message: \"Let's rock!\"}","mustEscape":true}
-{"type":"end-attributes","line":5,"col":42}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"foo"}
-{"type":"start-attributes","line":6,"col":4}
-{"type":"attribute","line":6,"col":5,"name":"data-ampersand","val":"{message: \"a quote: &quot; this & that\"}","mustEscape":true}
-{"type":"end-attributes","line":6,"col":60}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"foo"}
-{"type":"start-attributes","line":7,"col":4}
-{"type":"attribute","line":7,"col":5,"name":"data-epoc","val":"new Date(0)","mustEscape":true}
-{"type":"end-attributes","line":7,"col":26}
-{"type":"newline","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":1,"column":30}},"val":"var user = { name: 'tobi' }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":19}},"name":"data-user","mustEscape":true,"val":"user"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":19},"filename":"/cases/attrs-data.pug","end":{"line":2,"column":20}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":23}},"name":"data-items","mustEscape":true,"val":"[1,2,3]"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":23},"filename":"/cases/attrs-data.pug","end":{"line":3,"column":24}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":25}},"name":"data-username","mustEscape":true,"val":"'tobi'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":25},"filename":"/cases/attrs-data.pug","end":{"line":4,"column":26}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":42}},"name":"data-escaped","mustEscape":true,"val":"{message: \"Let's rock!\"}"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":42},"filename":"/cases/attrs-data.pug","end":{"line":5,"column":43}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":60}},"name":"data-ampersand","mustEscape":true,"val":"{message: \"a quote: &quot; this & that\"}"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":60},"filename":"/cases/attrs-data.pug","end":{"line":6,"column":61}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":4},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":5},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":26}},"name":"data-epoc","mustEscape":true,"val":"new Date(0)"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":26},"filename":"/cases/attrs-data.pug","end":{"line":7,"column":27}}}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/attrs-data.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs.js.tokens.json b/packages/pug-parser/test/cases/attrs.js.tokens.json
index 7d8500073..7da64d970 100644
--- a/packages/pug-parser/test/cases/attrs.js.tokens.json
+++ b/packages/pug-parser/test/cases/attrs.js.tokens.json
@@ -1,78 +1,78 @@
-{"type":"code","line":1,"col":1,"val":"var id = 5","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"function answer() { return 42; }","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":3,"col":23,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":37}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"a"}
-{"type":"start-attributes","line":4,"col":2}
-{"type":"attribute","line":4,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":4,"col":27,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":45}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"meta"}
-{"type":"start-attributes","line":5,"col":5}
-{"type":"attribute","line":5,"col":6,"name":"key","val":"'answer'","mustEscape":true}
-{"type":"attribute","line":5,"col":20,"name":"value","val":"answer()","mustEscape":true}
-{"type":"end-attributes","line":5,"col":34}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"a"}
-{"type":"start-attributes","line":6,"col":2}
-{"type":"attribute","line":6,"col":3,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":6,"col":31}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"a"}
-{"type":"class","line":7,"col":2,"val":"tag-class"}
-{"type":"start-attributes","line":7,"col":12}
-{"type":"attribute","line":7,"col":13,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":7,"col":41}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"a"}
-{"type":"start-attributes","line":9,"col":2}
-{"type":"attribute","line":9,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":9,"col":22,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":9,"col":36}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"a"}
-{"type":"start-attributes","line":10,"col":2}
-{"type":"attribute","line":10,"col":3,"name":"href","val":"'/user/' + id","mustEscape":true}
-{"type":"attribute","line":10,"col":26,"name":"class","val":"'button'","mustEscape":true}
-{"type":"end-attributes","line":10,"col":44}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":1,"val":"meta"}
-{"type":"start-attributes","line":11,"col":5}
-{"type":"attribute","line":11,"col":6,"name":"key","val":"'answer'","mustEscape":true}
-{"type":"attribute","line":11,"col":19,"name":"value","val":"answer()","mustEscape":true}
-{"type":"end-attributes","line":11,"col":33}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"a"}
-{"type":"start-attributes","line":12,"col":2}
-{"type":"attribute","line":12,"col":3,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":12,"col":31}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":1,"val":"a"}
-{"type":"class","line":13,"col":2,"val":"tag-class"}
-{"type":"start-attributes","line":13,"col":12}
-{"type":"attribute","line":13,"col":13,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":13,"col":41}
-{"type":"newline","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"div"}
-{"type":"start-attributes","line":15,"col":4}
-{"type":"attribute","line":15,"col":5,"name":"id","val":"id","mustEscape":true}
-{"type":"end-attributes","line":15,"col":10}
-{"type":"&attributes","line":15,"col":11,"val":"{foo: 'bar'}"}
-{"type":"newline","line":16,"col":1}
-{"type":"code","line":16,"col":1,"val":"var bar = null","mustEscape":false,"buffer":false}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"div"}
-{"type":"start-attributes","line":17,"col":4}
-{"type":"attribute","line":17,"col":5,"name":"foo","val":"null","mustEscape":true}
-{"type":"attribute","line":17,"col":14,"name":"bar","val":"bar","mustEscape":true}
-{"type":"end-attributes","line":17,"col":21}
-{"type":"&attributes","line":17,"col":22,"val":"{baz: 'baz'}"}
-{"type":"newline","line":18,"col":1}
-{"type":"eos","line":18,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":1,"column":13}},"val":"var id = 5","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":2,"column":35}},"val":"function answer() { return 42; }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":21}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":3,"column":23},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":37}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":37},"filename":"/cases/attrs.js.pug","end":{"line":3,"column":38}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":25}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":4,"column":27},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":45}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":45},"filename":"/cases/attrs.js.pug","end":{"line":4,"column":46}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":5}},"val":"meta"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":6},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":18}},"name":"key","mustEscape":true,"val":"'answer'"}
+{"type":"attribute","loc":{"start":{"line":5,"column":20},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":34}},"name":"value","mustEscape":true,"val":"answer()"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":34},"filename":"/cases/attrs.js.pug","end":{"line":5,"column":35}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":31}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":31},"filename":"/cases/attrs.js.pug","end":{"line":6,"column":32}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":7,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":12}},"val":"tag-class"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":12},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":13},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":41}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":41},"filename":"/cases/attrs.js.pug","end":{"line":7,"column":42}}}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":21}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":9,"column":22},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":36}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":36},"filename":"/cases/attrs.js.pug","end":{"line":9,"column":37}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":25}},"name":"href","mustEscape":true,"val":"'/user/' + id"}
+{"type":"attribute","loc":{"start":{"line":10,"column":26},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":44}},"name":"class","mustEscape":true,"val":"'button'"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":44},"filename":"/cases/attrs.js.pug","end":{"line":10,"column":45}}}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":1}}}
+{"type":"tag","loc":{"start":{"line":11,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":5}},"val":"meta"}
+{"type":"start-attributes","loc":{"start":{"line":11,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":11,"column":6},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":18}},"name":"key","mustEscape":true,"val":"'answer'"}
+{"type":"attribute","loc":{"start":{"line":11,"column":19},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":33}},"name":"value","mustEscape":true,"val":"answer()"}
+{"type":"end-attributes","loc":{"start":{"line":11,"column":33},"filename":"/cases/attrs.js.pug","end":{"line":11,"column":34}}}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":1}}}
+{"type":"tag","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":3},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":31}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":31},"filename":"/cases/attrs.js.pug","end":{"line":12,"column":32}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":13,"column":2},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":12}},"val":"tag-class"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":12},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":13},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":41}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":41},"filename":"/cases/attrs.js.pug","end":{"line":13,"column":42}}}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":4}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":4},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":10}},"name":"id","mustEscape":true,"val":"id"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":10},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":11}}}
+{"type":"&attributes","loc":{"start":{"line":15,"column":11},"filename":"/cases/attrs.js.pug","end":{"line":15,"column":36}},"val":"{foo: 'bar'}"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":16,"column":1}}}
+{"type":"code","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":16,"column":17}},"val":"var bar = null","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":4}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":17,"column":4},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":17,"column":5},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":13}},"name":"foo","mustEscape":true,"val":"null"}
+{"type":"attribute","loc":{"start":{"line":17,"column":14},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":21}},"name":"bar","mustEscape":true,"val":"bar"}
+{"type":"end-attributes","loc":{"start":{"line":17,"column":21},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":22}}}
+{"type":"&attributes","loc":{"start":{"line":17,"column":22},"filename":"/cases/attrs.js.pug","end":{"line":17,"column":47}},"val":"{baz: 'baz'}"}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":18,"column":1}}}
+{"type":"eos","loc":{"start":{"line":18,"column":1},"filename":"/cases/attrs.js.pug","end":{"line":18,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs.tokens.json b/packages/pug-parser/test/cases/attrs.tokens.json
index 32a0ad3c8..d15ce773c 100644
--- a/packages/pug-parser/test/cases/attrs.tokens.json
+++ b/packages/pug-parser/test/cases/attrs.tokens.json
@@ -1,180 +1,180 @@
-{"type":"tag","line":1,"col":1,"val":"a"}
-{"type":"start-attributes","line":1,"col":2}
-{"type":"attribute","line":1,"col":3,"name":"href","val":"'/contact'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":18}
-{"type":"text","line":1,"col":20,"val":"contact"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"a"}
-{"type":"start-attributes","line":2,"col":2}
-{"type":"attribute","line":2,"col":3,"name":"href","val":"'/save'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":15}
-{"type":"class","line":2,"col":16,"val":"button"}
-{"type":"text","line":2,"col":24,"val":"save"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"foo","val":true,"mustEscape":true}
-{"type":"attribute","line":3,"col":8,"name":"bar","val":true,"mustEscape":false}
-{"type":"attribute","line":3,"col":13,"name":"baz","val":true,"mustEscape":false}
-{"type":"end-attributes","line":3,"col":16}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"a"}
-{"type":"start-attributes","line":4,"col":2}
-{"type":"attribute","line":4,"col":3,"name":"foo","val":"'foo, bar, baz'","mustEscape":true}
-{"type":"attribute","line":4,"col":24,"name":"bar","val":"1","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"a"}
-{"type":"start-attributes","line":5,"col":2}
-{"type":"attribute","line":5,"col":3,"name":"foo","val":"'((foo))'","mustEscape":true}
-{"type":"attribute","line":5,"col":18,"name":"bar","val":"(1) ? 1 : 0","mustEscape":true}
-{"type":"end-attributes","line":5,"col":35}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"select"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"tag","line":7,"col":3,"val":"option"}
-{"type":"start-attributes","line":7,"col":9}
-{"type":"attribute","line":7,"col":10,"name":"value","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":7,"col":23,"name":"selected","val":true,"mustEscape":false}
-{"type":"end-attributes","line":7,"col":31}
-{"type":"text","line":7,"col":33,"val":"Foo"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":3,"val":"option"}
-{"type":"start-attributes","line":8,"col":9}
-{"type":"attribute","line":8,"col":10,"name":"selected","val":true,"mustEscape":true}
-{"type":"attribute","line":8,"col":20,"name":"value","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":8,"col":31}
-{"type":"text","line":8,"col":33,"val":"Bar"}
-{"type":"outdent","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"a"}
-{"type":"start-attributes","line":9,"col":2}
-{"type":"attribute","line":9,"col":3,"name":"foo","val":"\"class:\"","mustEscape":true}
-{"type":"end-attributes","line":9,"col":15}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"input"}
-{"type":"start-attributes","line":10,"col":6}
-{"type":"attribute","line":10,"col":7,"name":"pattern","val":"'\\\\S+'","mustEscape":true}
-{"type":"end-attributes","line":10,"col":21}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"a"}
-{"type":"start-attributes","line":12,"col":2}
-{"type":"attribute","line":12,"col":3,"name":"href","val":"'/contact'","mustEscape":true}
-{"type":"end-attributes","line":12,"col":18}
-{"type":"text","line":12,"col":20,"val":"contact"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":1,"val":"a"}
-{"type":"start-attributes","line":13,"col":2}
-{"type":"attribute","line":13,"col":3,"name":"href","val":"'/save'","mustEscape":true}
-{"type":"end-attributes","line":13,"col":15}
-{"type":"class","line":13,"col":16,"val":"button"}
-{"type":"text","line":13,"col":24,"val":"save"}
-{"type":"newline","line":14,"col":1}
-{"type":"tag","line":14,"col":1,"val":"a"}
-{"type":"start-attributes","line":14,"col":2}
-{"type":"attribute","line":14,"col":3,"name":"foo","val":true,"mustEscape":true}
-{"type":"attribute","line":14,"col":7,"name":"bar","val":true,"mustEscape":false}
-{"type":"attribute","line":14,"col":11,"name":"baz","val":true,"mustEscape":false}
-{"type":"end-attributes","line":14,"col":14}
-{"type":"newline","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"a"}
-{"type":"start-attributes","line":15,"col":2}
-{"type":"attribute","line":15,"col":3,"name":"foo","val":"'foo, bar, baz'","mustEscape":true}
-{"type":"attribute","line":15,"col":23,"name":"bar","val":"1","mustEscape":true}
-{"type":"end-attributes","line":15,"col":28}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":1,"val":"a"}
-{"type":"start-attributes","line":16,"col":2}
-{"type":"attribute","line":16,"col":3,"name":"foo","val":"'((foo))'","mustEscape":true}
-{"type":"attribute","line":16,"col":17,"name":"bar","val":"(1) ? 1 : 0","mustEscape":true}
-{"type":"end-attributes","line":16,"col":34}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"select"}
-{"type":"indent","line":18,"col":1,"val":2}
-{"type":"tag","line":18,"col":3,"val":"option"}
-{"type":"start-attributes","line":18,"col":9}
-{"type":"attribute","line":18,"col":10,"name":"value","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":18,"col":22,"name":"selected","val":true,"mustEscape":false}
-{"type":"end-attributes","line":18,"col":30}
-{"type":"text","line":18,"col":32,"val":"Foo"}
-{"type":"newline","line":19,"col":1}
-{"type":"tag","line":19,"col":3,"val":"option"}
-{"type":"start-attributes","line":19,"col":9}
-{"type":"attribute","line":19,"col":10,"name":"selected","val":true,"mustEscape":true}
-{"type":"attribute","line":19,"col":19,"name":"value","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":19,"col":30}
-{"type":"text","line":19,"col":32,"val":"Bar"}
-{"type":"outdent","line":20,"col":1}
-{"type":"tag","line":20,"col":1,"val":"a"}
-{"type":"start-attributes","line":20,"col":2}
-{"type":"attribute","line":20,"col":3,"name":"foo","val":"\"class:\"","mustEscape":true}
-{"type":"end-attributes","line":20,"col":15}
-{"type":"newline","line":21,"col":1}
-{"type":"tag","line":21,"col":1,"val":"input"}
-{"type":"start-attributes","line":21,"col":6}
-{"type":"attribute","line":21,"col":7,"name":"pattern","val":"'\\\\S+'","mustEscape":true}
-{"type":"end-attributes","line":21,"col":21}
-{"type":"newline","line":22,"col":1}
-{"type":"tag","line":22,"col":1,"val":"foo"}
-{"type":"start-attributes","line":22,"col":4}
-{"type":"attribute","line":22,"col":5,"name":"terse","val":"\"true\"","mustEscape":true}
-{"type":"end-attributes","line":22,"col":17}
-{"type":"newline","line":23,"col":1}
-{"type":"tag","line":23,"col":1,"val":"foo"}
-{"type":"start-attributes","line":23,"col":4}
-{"type":"attribute","line":23,"col":5,"name":"date","val":"new Date(0)","mustEscape":true}
-{"type":"end-attributes","line":23,"col":21}
-{"type":"newline","line":25,"col":1}
-{"type":"tag","line":25,"col":1,"val":"foo"}
-{"type":"start-attributes","line":25,"col":4}
-{"type":"attribute","line":25,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":26,"col":5,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":26,"col":8}
-{"type":"newline","line":27,"col":1}
-{"type":"tag","line":27,"col":1,"val":"foo"}
-{"type":"start-attributes","line":27,"col":4}
-{"type":"attribute","line":27,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":28,"col":5,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":28,"col":8}
-{"type":"newline","line":29,"col":1}
-{"type":"tag","line":29,"col":1,"val":"foo"}
-{"type":"start-attributes","line":29,"col":4}
-{"type":"attribute","line":29,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":30,"col":3,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":30,"col":6}
-{"type":"newline","line":31,"col":1}
-{"type":"tag","line":31,"col":1,"val":"foo"}
-{"type":"start-attributes","line":31,"col":4}
-{"type":"attribute","line":31,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":32,"col":4,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":32,"col":7}
-{"type":"newline","line":33,"col":1}
-{"type":"tag","line":33,"col":1,"val":"foo"}
-{"type":"start-attributes","line":33,"col":4}
-{"type":"attribute","line":33,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":34,"col":3,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":34,"col":6}
-{"type":"newline","line":35,"col":1}
-{"type":"tag","line":35,"col":1,"val":"foo"}
-{"type":"start-attributes","line":35,"col":4}
-{"type":"attribute","line":35,"col":5,"name":"abc","val":true,"mustEscape":true}
-{"type":"attribute","line":36,"col":5,"name":"def","val":true,"mustEscape":false}
-{"type":"end-attributes","line":36,"col":8}
-{"type":"newline","line":38,"col":1}
-{"type":"code","line":38,"col":1,"val":"var attrs = {foo: 'bar', bar: '<baz>'}","mustEscape":false,"buffer":false}
-{"type":"newline","line":40,"col":1}
-{"type":"tag","line":40,"col":1,"val":"div"}
-{"type":"&attributes","line":40,"col":4,"val":"attrs"}
-{"type":"newline","line":42,"col":1}
-{"type":"tag","line":42,"col":1,"val":"a"}
-{"type":"start-attributes","line":42,"col":2}
-{"type":"attribute","line":42,"col":3,"name":"foo","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":42,"col":14,"name":"bar","val":"\"bar\"","mustEscape":true}
-{"type":"end-attributes","line":42,"col":24}
-{"type":"newline","line":43,"col":1}
-{"type":"tag","line":43,"col":1,"val":"a"}
-{"type":"start-attributes","line":43,"col":2}
-{"type":"attribute","line":43,"col":3,"name":"foo","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":43,"col":14,"name":"bar","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":43,"col":24}
-{"type":"newline","line":44,"col":1}
-{"type":"eos","line":44,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs.pug","end":{"line":1,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":2},"filename":"/cases/attrs.pug","end":{"line":1,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":3},"filename":"/cases/attrs.pug","end":{"line":1,"column":18}},"name":"href","mustEscape":true,"val":"'/contact'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":18},"filename":"/cases/attrs.pug","end":{"line":1,"column":19}}}
+{"type":"text","loc":{"start":{"line":1,"column":20},"filename":"/cases/attrs.pug","end":{"line":1,"column":27}},"val":"contact"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.pug","end":{"line":2,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":2},"filename":"/cases/attrs.pug","end":{"line":2,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":3},"filename":"/cases/attrs.pug","end":{"line":2,"column":15}},"name":"href","mustEscape":true,"val":"'/save'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":15},"filename":"/cases/attrs.pug","end":{"line":2,"column":16}}}
+{"type":"class","loc":{"start":{"line":2,"column":16},"filename":"/cases/attrs.pug","end":{"line":2,"column":23}},"val":"button"}
+{"type":"text","loc":{"start":{"line":2,"column":24},"filename":"/cases/attrs.pug","end":{"line":2,"column":28}},"val":"save"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/attrs.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/attrs.pug","end":{"line":3,"column":6}},"name":"foo","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":3,"column":8},"filename":"/cases/attrs.pug","end":{"line":3,"column":11}},"name":"bar","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":3,"column":13},"filename":"/cases/attrs.pug","end":{"line":3,"column":16}},"name":"baz","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":16},"filename":"/cases/attrs.pug","end":{"line":3,"column":17}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/attrs.pug","end":{"line":4,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":2},"filename":"/cases/attrs.pug","end":{"line":4,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":3},"filename":"/cases/attrs.pug","end":{"line":4,"column":22}},"name":"foo","mustEscape":true,"val":"'foo, bar, baz'"}
+{"type":"attribute","loc":{"start":{"line":4,"column":24},"filename":"/cases/attrs.pug","end":{"line":4,"column":29}},"name":"bar","mustEscape":true,"val":"1"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/attrs.pug","end":{"line":4,"column":30}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/attrs.pug","end":{"line":5,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":2},"filename":"/cases/attrs.pug","end":{"line":5,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":3},"filename":"/cases/attrs.pug","end":{"line":5,"column":16}},"name":"foo","mustEscape":true,"val":"'((foo))'"}
+{"type":"attribute","loc":{"start":{"line":5,"column":18},"filename":"/cases/attrs.pug","end":{"line":5,"column":34}},"name":"bar","mustEscape":true,"val":"(1) ? 1 : 0"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":35},"filename":"/cases/attrs.pug","end":{"line":5,"column":36}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/attrs.pug","end":{"line":6,"column":7}},"val":"select"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/attrs.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/attrs.pug","end":{"line":7,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":9},"filename":"/cases/attrs.pug","end":{"line":7,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":10},"filename":"/cases/attrs.pug","end":{"line":7,"column":21}},"name":"value","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":7,"column":23},"filename":"/cases/attrs.pug","end":{"line":7,"column":31}},"name":"selected","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":31},"filename":"/cases/attrs.pug","end":{"line":7,"column":32}}}
+{"type":"text","loc":{"start":{"line":7,"column":33},"filename":"/cases/attrs.pug","end":{"line":7,"column":36}},"val":"Foo"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/attrs.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/attrs.pug","end":{"line":8,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":9},"filename":"/cases/attrs.pug","end":{"line":8,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":10},"filename":"/cases/attrs.pug","end":{"line":8,"column":18}},"name":"selected","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":8,"column":20},"filename":"/cases/attrs.pug","end":{"line":8,"column":31}},"name":"value","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":31},"filename":"/cases/attrs.pug","end":{"line":8,"column":32}}}
+{"type":"text","loc":{"start":{"line":8,"column":33},"filename":"/cases/attrs.pug","end":{"line":8,"column":36}},"val":"Bar"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/attrs.pug","end":{"line":9,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":2},"filename":"/cases/attrs.pug","end":{"line":9,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":3},"filename":"/cases/attrs.pug","end":{"line":9,"column":15}},"name":"foo","mustEscape":true,"val":"\"class:\""}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":15},"filename":"/cases/attrs.pug","end":{"line":9,"column":16}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/attrs.pug","end":{"line":10,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":6},"filename":"/cases/attrs.pug","end":{"line":10,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":7},"filename":"/cases/attrs.pug","end":{"line":10,"column":21}},"name":"pattern","mustEscape":true,"val":"'\\\\S+'"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":21},"filename":"/cases/attrs.pug","end":{"line":10,"column":22}}}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.pug","end":{"line":12,"column":1}}}
+{"type":"tag","loc":{"start":{"line":12,"column":1},"filename":"/cases/attrs.pug","end":{"line":12,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":2},"filename":"/cases/attrs.pug","end":{"line":12,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":3},"filename":"/cases/attrs.pug","end":{"line":12,"column":18}},"name":"href","mustEscape":true,"val":"'/contact'"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":18},"filename":"/cases/attrs.pug","end":{"line":12,"column":19}}}
+{"type":"text","loc":{"start":{"line":12,"column":20},"filename":"/cases/attrs.pug","end":{"line":12,"column":27}},"val":"contact"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/attrs.pug","end":{"line":13,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":2},"filename":"/cases/attrs.pug","end":{"line":13,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":3},"filename":"/cases/attrs.pug","end":{"line":13,"column":15}},"name":"href","mustEscape":true,"val":"'/save'"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":15},"filename":"/cases/attrs.pug","end":{"line":13,"column":16}}}
+{"type":"class","loc":{"start":{"line":13,"column":16},"filename":"/cases/attrs.pug","end":{"line":13,"column":23}},"val":"button"}
+{"type":"text","loc":{"start":{"line":13,"column":24},"filename":"/cases/attrs.pug","end":{"line":13,"column":28}},"val":"save"}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/attrs.pug","end":{"line":14,"column":1}}}
+{"type":"tag","loc":{"start":{"line":14,"column":1},"filename":"/cases/attrs.pug","end":{"line":14,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":14,"column":2},"filename":"/cases/attrs.pug","end":{"line":14,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":14,"column":3},"filename":"/cases/attrs.pug","end":{"line":14,"column":6}},"name":"foo","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":14,"column":7},"filename":"/cases/attrs.pug","end":{"line":14,"column":10}},"name":"bar","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":14,"column":11},"filename":"/cases/attrs.pug","end":{"line":14,"column":14}},"name":"baz","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":14,"column":14},"filename":"/cases/attrs.pug","end":{"line":14,"column":15}}}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/attrs.pug","end":{"line":15,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":2},"filename":"/cases/attrs.pug","end":{"line":15,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":3},"filename":"/cases/attrs.pug","end":{"line":15,"column":22}},"name":"foo","mustEscape":true,"val":"'foo, bar, baz'"}
+{"type":"attribute","loc":{"start":{"line":15,"column":23},"filename":"/cases/attrs.pug","end":{"line":15,"column":28}},"name":"bar","mustEscape":true,"val":"1"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":28},"filename":"/cases/attrs.pug","end":{"line":15,"column":29}}}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.pug","end":{"line":16,"column":1}}}
+{"type":"tag","loc":{"start":{"line":16,"column":1},"filename":"/cases/attrs.pug","end":{"line":16,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":16,"column":2},"filename":"/cases/attrs.pug","end":{"line":16,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":16,"column":3},"filename":"/cases/attrs.pug","end":{"line":16,"column":16}},"name":"foo","mustEscape":true,"val":"'((foo))'"}
+{"type":"attribute","loc":{"start":{"line":16,"column":17},"filename":"/cases/attrs.pug","end":{"line":16,"column":33}},"name":"bar","mustEscape":true,"val":"(1) ? 1 : 0"}
+{"type":"end-attributes","loc":{"start":{"line":16,"column":34},"filename":"/cases/attrs.pug","end":{"line":16,"column":35}}}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/attrs.pug","end":{"line":17,"column":7}},"val":"select"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/attrs.pug","end":{"line":18,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":18,"column":3},"filename":"/cases/attrs.pug","end":{"line":18,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":18,"column":9},"filename":"/cases/attrs.pug","end":{"line":18,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":18,"column":10},"filename":"/cases/attrs.pug","end":{"line":18,"column":21}},"name":"value","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":18,"column":22},"filename":"/cases/attrs.pug","end":{"line":18,"column":30}},"name":"selected","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":18,"column":30},"filename":"/cases/attrs.pug","end":{"line":18,"column":31}}}
+{"type":"text","loc":{"start":{"line":18,"column":32},"filename":"/cases/attrs.pug","end":{"line":18,"column":35}},"val":"Foo"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/attrs.pug","end":{"line":19,"column":3}}}
+{"type":"tag","loc":{"start":{"line":19,"column":3},"filename":"/cases/attrs.pug","end":{"line":19,"column":9}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":9},"filename":"/cases/attrs.pug","end":{"line":19,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":10},"filename":"/cases/attrs.pug","end":{"line":19,"column":18}},"name":"selected","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":19,"column":19},"filename":"/cases/attrs.pug","end":{"line":19,"column":30}},"name":"value","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":30},"filename":"/cases/attrs.pug","end":{"line":19,"column":31}}}
+{"type":"text","loc":{"start":{"line":19,"column":32},"filename":"/cases/attrs.pug","end":{"line":19,"column":35}},"val":"Bar"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/attrs.pug","end":{"line":20,"column":1}}}
+{"type":"tag","loc":{"start":{"line":20,"column":1},"filename":"/cases/attrs.pug","end":{"line":20,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":20,"column":2},"filename":"/cases/attrs.pug","end":{"line":20,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":20,"column":3},"filename":"/cases/attrs.pug","end":{"line":20,"column":15}},"name":"foo","mustEscape":true,"val":"\"class:\""}
+{"type":"end-attributes","loc":{"start":{"line":20,"column":15},"filename":"/cases/attrs.pug","end":{"line":20,"column":16}}}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/attrs.pug","end":{"line":21,"column":1}}}
+{"type":"tag","loc":{"start":{"line":21,"column":1},"filename":"/cases/attrs.pug","end":{"line":21,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":21,"column":6},"filename":"/cases/attrs.pug","end":{"line":21,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":21,"column":7},"filename":"/cases/attrs.pug","end":{"line":21,"column":21}},"name":"pattern","mustEscape":true,"val":"'\\\\S+'"}
+{"type":"end-attributes","loc":{"start":{"line":21,"column":21},"filename":"/cases/attrs.pug","end":{"line":21,"column":22}}}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/attrs.pug","end":{"line":22,"column":1}}}
+{"type":"tag","loc":{"start":{"line":22,"column":1},"filename":"/cases/attrs.pug","end":{"line":22,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":22,"column":4},"filename":"/cases/attrs.pug","end":{"line":22,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":22,"column":5},"filename":"/cases/attrs.pug","end":{"line":22,"column":17}},"name":"terse","mustEscape":true,"val":"\"true\""}
+{"type":"end-attributes","loc":{"start":{"line":22,"column":17},"filename":"/cases/attrs.pug","end":{"line":22,"column":18}}}
+{"type":"newline","loc":{"start":{"line":23,"column":1},"filename":"/cases/attrs.pug","end":{"line":23,"column":1}}}
+{"type":"tag","loc":{"start":{"line":23,"column":1},"filename":"/cases/attrs.pug","end":{"line":23,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":23,"column":4},"filename":"/cases/attrs.pug","end":{"line":23,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":23,"column":5},"filename":"/cases/attrs.pug","end":{"line":23,"column":21}},"name":"date","mustEscape":true,"val":"new Date(0)"}
+{"type":"end-attributes","loc":{"start":{"line":23,"column":21},"filename":"/cases/attrs.pug","end":{"line":23,"column":22}}}
+{"type":"newline","loc":{"start":{"line":25,"column":1},"filename":"/cases/attrs.pug","end":{"line":25,"column":1}}}
+{"type":"tag","loc":{"start":{"line":25,"column":1},"filename":"/cases/attrs.pug","end":{"line":25,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":25,"column":4},"filename":"/cases/attrs.pug","end":{"line":25,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":25,"column":5},"filename":"/cases/attrs.pug","end":{"line":25,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":26,"column":5},"filename":"/cases/attrs.pug","end":{"line":26,"column":8}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":26,"column":8},"filename":"/cases/attrs.pug","end":{"line":26,"column":9}}}
+{"type":"newline","loc":{"start":{"line":27,"column":1},"filename":"/cases/attrs.pug","end":{"line":27,"column":1}}}
+{"type":"tag","loc":{"start":{"line":27,"column":1},"filename":"/cases/attrs.pug","end":{"line":27,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":27,"column":4},"filename":"/cases/attrs.pug","end":{"line":27,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":27,"column":5},"filename":"/cases/attrs.pug","end":{"line":27,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":28,"column":5},"filename":"/cases/attrs.pug","end":{"line":28,"column":8}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":28,"column":8},"filename":"/cases/attrs.pug","end":{"line":28,"column":9}}}
+{"type":"newline","loc":{"start":{"line":29,"column":1},"filename":"/cases/attrs.pug","end":{"line":29,"column":1}}}
+{"type":"tag","loc":{"start":{"line":29,"column":1},"filename":"/cases/attrs.pug","end":{"line":29,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":29,"column":4},"filename":"/cases/attrs.pug","end":{"line":29,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":29,"column":5},"filename":"/cases/attrs.pug","end":{"line":29,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":30,"column":3},"filename":"/cases/attrs.pug","end":{"line":30,"column":6}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":30,"column":6},"filename":"/cases/attrs.pug","end":{"line":30,"column":7}}}
+{"type":"newline","loc":{"start":{"line":31,"column":1},"filename":"/cases/attrs.pug","end":{"line":31,"column":1}}}
+{"type":"tag","loc":{"start":{"line":31,"column":1},"filename":"/cases/attrs.pug","end":{"line":31,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":31,"column":4},"filename":"/cases/attrs.pug","end":{"line":31,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":31,"column":5},"filename":"/cases/attrs.pug","end":{"line":31,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":32,"column":4},"filename":"/cases/attrs.pug","end":{"line":32,"column":7}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":32,"column":7},"filename":"/cases/attrs.pug","end":{"line":32,"column":8}}}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/attrs.pug","end":{"line":33,"column":1}}}
+{"type":"tag","loc":{"start":{"line":33,"column":1},"filename":"/cases/attrs.pug","end":{"line":33,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":33,"column":4},"filename":"/cases/attrs.pug","end":{"line":33,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":33,"column":5},"filename":"/cases/attrs.pug","end":{"line":33,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":34,"column":3},"filename":"/cases/attrs.pug","end":{"line":34,"column":6}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":34,"column":6},"filename":"/cases/attrs.pug","end":{"line":34,"column":7}}}
+{"type":"newline","loc":{"start":{"line":35,"column":1},"filename":"/cases/attrs.pug","end":{"line":35,"column":1}}}
+{"type":"tag","loc":{"start":{"line":35,"column":1},"filename":"/cases/attrs.pug","end":{"line":35,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":35,"column":4},"filename":"/cases/attrs.pug","end":{"line":35,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":35,"column":5},"filename":"/cases/attrs.pug","end":{"line":35,"column":8}},"name":"abc","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":36,"column":5},"filename":"/cases/attrs.pug","end":{"line":36,"column":8}},"name":"def","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":36,"column":8},"filename":"/cases/attrs.pug","end":{"line":36,"column":9}}}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/attrs.pug","end":{"line":38,"column":1}}}
+{"type":"code","loc":{"start":{"line":38,"column":1},"filename":"/cases/attrs.pug","end":{"line":38,"column":41}},"val":"var attrs = {foo: 'bar', bar: '<baz>'}","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":40,"column":1},"filename":"/cases/attrs.pug","end":{"line":40,"column":1}}}
+{"type":"tag","loc":{"start":{"line":40,"column":1},"filename":"/cases/attrs.pug","end":{"line":40,"column":4}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":40,"column":4},"filename":"/cases/attrs.pug","end":{"line":40,"column":22}},"val":"attrs"}
+{"type":"newline","loc":{"start":{"line":42,"column":1},"filename":"/cases/attrs.pug","end":{"line":42,"column":1}}}
+{"type":"tag","loc":{"start":{"line":42,"column":1},"filename":"/cases/attrs.pug","end":{"line":42,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":42,"column":2},"filename":"/cases/attrs.pug","end":{"line":42,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":42,"column":3},"filename":"/cases/attrs.pug","end":{"line":42,"column":12}},"name":"foo","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":42,"column":13},"filename":"/cases/attrs.pug","end":{"line":42,"column":24}},"name":"bar","mustEscape":true,"val":"\"bar\""}
+{"type":"end-attributes","loc":{"start":{"line":42,"column":24},"filename":"/cases/attrs.pug","end":{"line":42,"column":25}}}
+{"type":"newline","loc":{"start":{"line":43,"column":1},"filename":"/cases/attrs.pug","end":{"line":43,"column":1}}}
+{"type":"tag","loc":{"start":{"line":43,"column":1},"filename":"/cases/attrs.pug","end":{"line":43,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":43,"column":2},"filename":"/cases/attrs.pug","end":{"line":43,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":43,"column":3},"filename":"/cases/attrs.pug","end":{"line":43,"column":12}},"name":"foo","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":43,"column":13},"filename":"/cases/attrs.pug","end":{"line":43,"column":24}},"name":"bar","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":43,"column":24},"filename":"/cases/attrs.pug","end":{"line":43,"column":25}}}
+{"type":"newline","loc":{"start":{"line":44,"column":1},"filename":"/cases/attrs.pug","end":{"line":44,"column":1}}}
+{"type":"eos","loc":{"start":{"line":44,"column":1},"filename":"/cases/attrs.pug","end":{"line":44,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/attrs.unescaped.tokens.json b/packages/pug-parser/test/cases/attrs.unescaped.tokens.json
index bc7d33633..9cce52196 100644
--- a/packages/pug-parser/test/cases/attrs.unescaped.tokens.json
+++ b/packages/pug-parser/test/cases/attrs.unescaped.tokens.json
@@ -1,15 +1,15 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"div"}
-{"type":"start-attributes","line":2,"col":6}
-{"type":"attribute","line":2,"col":7,"name":"id","val":"'user-<%= user.id %>'","mustEscape":false}
-{"type":"end-attributes","line":2,"col":32}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h1"}
-{"type":"text","line":3,"col":8,"val":"<%= user.title %>"}
-{"type":"outdent","line":3,"col":25}
-{"type":"outdent","line":3,"col":25}
-{"type":"eos","line":3,"col":25}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":30}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/attrs.unescaped.pug","end":{"line":1,"column":31}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":6}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":6},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":7},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":32}},"name":"id","mustEscape":false,"val":"'user-<%= user.id %>'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":32},"filename":"/cases/attrs.unescaped.pug","end":{"line":2,"column":33}}}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}},"val":"<%= user.title %>"}
+{"type":"outdent","loc":{"start":{"line":3,"column":25},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":3,"column":25},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}}}
+{"type":"eos","loc":{"start":{"line":3,"column":25},"filename":"/cases/attrs.unescaped.pug","end":{"line":3,"column":25}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/basic.tokens.json b/packages/pug-parser/test/cases/basic.tokens.json
index 7897d33f4..0d38aae15 100644
--- a/packages/pug-parser/test/cases/basic.tokens.json
+++ b/packages/pug-parser/test/cases/basic.tokens.json
@@ -1,9 +1,9 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h1"}
-{"type":"text","line":3,"col":8,"val":"Title"}
-{"type":"outdent","line":3,"col":13}
-{"type":"outdent","line":3,"col":13}
-{"type":"eos","line":3,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/basic.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/basic.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/basic.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/basic.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/basic.pug","end":{"line":3,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/basic.pug","end":{"line":3,"column":13}},"val":"Title"}
+{"type":"outdent","loc":{"start":{"line":3,"column":13},"filename":"/cases/basic.pug","end":{"line":3,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":3,"column":13},"filename":"/cases/basic.pug","end":{"line":3,"column":13}}}
+{"type":"eos","loc":{"start":{"line":3,"column":13},"filename":"/cases/basic.pug","end":{"line":3,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blanks.tokens.json b/packages/pug-parser/test/cases/blanks.tokens.json
index f20431ab6..1529f5c88 100644
--- a/packages/pug-parser/test/cases/blanks.tokens.json
+++ b/packages/pug-parser/test/cases/blanks.tokens.json
@@ -1,13 +1,13 @@
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"ul"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"li"}
-{"type":"text","line":4,"col":6,"val":"foo"}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"li"}
-{"type":"text","line":6,"col":6,"val":"bar"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":3,"val":"li"}
-{"type":"text","line":8,"col":6,"val":"baz"}
-{"type":"outdent","line":9,"col":1}
-{"type":"eos","line":9,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/blanks.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/blanks.pug","end":{"line":3,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/blanks.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/blanks.pug","end":{"line":4,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":4,"column":6},"filename":"/cases/blanks.pug","end":{"line":4,"column":9}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/blanks.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/blanks.pug","end":{"line":6,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":6,"column":6},"filename":"/cases/blanks.pug","end":{"line":6,"column":9}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/blanks.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/blanks.pug","end":{"line":8,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/blanks.pug","end":{"line":8,"column":9}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/blanks.pug","end":{"line":9,"column":1}}}
+{"type":"eos","loc":{"start":{"line":9,"column":1},"filename":"/cases/blanks.pug","end":{"line":9,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/block-code.tokens.json b/packages/pug-parser/test/cases/block-code.tokens.json
index b2acbc132..bff169482 100644
--- a/packages/pug-parser/test/cases/block-code.tokens.json
+++ b/packages/pug-parser/test/cases/block-code.tokens.json
@@ -1,28 +1,28 @@
-{"type":"blockcode","line":1,"col":1}
-{"type":"start-pipeless-text","line":1,"col":2}
-{"type":"text","line":2,"col":3,"val":"list = [\"uno\", \"dos\", \"tres\","}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"        \"cuatro\", \"cinco\", \"seis\"];"}
-{"type":"end-pipeless-text","line":3,"col":38}
-{"type":"newline","line":4,"col":1}
-{"type":"comment","line":4,"col":1,"val":" Without a block, the element is accepted and no code is generated","buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"blockcode","line":5,"col":1}
-{"type":"newline","line":6,"col":1}
-{"type":"each","line":6,"col":1,"val":"item","key":null,"code":"list"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"blockcode","line":7,"col":3}
-{"type":"start-pipeless-text","line":7,"col":4}
-{"type":"text","line":8,"col":5,"val":"string = item.charAt(0)"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":""}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":"  .toUpperCase() +"}
-{"type":"newline","line":11,"col":1}
-{"type":"text","line":11,"col":5,"val":"item.slice(1);"}
-{"type":"end-pipeless-text","line":11,"col":19}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":3,"val":"li"}
-{"type":"code","line":12,"col":5,"val":"string","mustEscape":true,"buffer":true}
-{"type":"outdent","line":13,"col":1}
-{"type":"eos","line":13,"col":1}
\ No newline at end of file
+{"type":"blockcode","loc":{"start":{"line":1,"column":1},"filename":"/cases/block-code.pug","end":{"line":1,"column":2}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":2},"filename":"/cases/block-code.pug","end":{"line":1,"column":2}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/block-code.pug","end":{"line":2,"column":32}},"val":"list = [\"uno\", \"dos\", \"tres\","}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/block-code.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/block-code.pug","end":{"line":3,"column":38}},"val":"        \"cuatro\", \"cinco\", \"seis\"];"}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":38},"filename":"/cases/block-code.pug","end":{"line":3,"column":38}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/block-code.pug","end":{"line":4,"column":1}}}
+{"type":"comment","loc":{"start":{"line":4,"column":1},"filename":"/cases/block-code.pug","end":{"line":4,"column":70}},"val":" Without a block, the element is accepted and no code is generated","buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-code.pug","end":{"line":5,"column":1}}}
+{"type":"blockcode","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-code.pug","end":{"line":5,"column":2}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/block-code.pug","end":{"line":6,"column":1}}}
+{"type":"each","loc":{"start":{"line":6,"column":1},"filename":"/cases/block-code.pug","end":{"line":6,"column":18}},"val":"item","key":null,"code":"list"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/block-code.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"blockcode","loc":{"start":{"line":7,"column":3},"filename":"/cases/block-code.pug","end":{"line":7,"column":4}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":7,"column":4},"filename":"/cases/block-code.pug","end":{"line":7,"column":4}}}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/block-code.pug","end":{"line":8,"column":28}},"val":"string = item.charAt(0)"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/block-code.pug","end":{"line":9,"column":5}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/block-code.pug","end":{"line":9,"column":5}},"val":""}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/block-code.pug","end":{"line":10,"column":5}}}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/block-code.pug","end":{"line":10,"column":23}},"val":"  .toUpperCase() +"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/block-code.pug","end":{"line":11,"column":5}}}
+{"type":"text","loc":{"start":{"line":11,"column":5},"filename":"/cases/block-code.pug","end":{"line":11,"column":19}},"val":"item.slice(1);"}
+{"type":"end-pipeless-text","loc":{"start":{"line":11,"column":19},"filename":"/cases/block-code.pug","end":{"line":11,"column":19}}}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/block-code.pug","end":{"line":12,"column":3}}}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/block-code.pug","end":{"line":12,"column":5}},"val":"li"}
+{"type":"code","loc":{"start":{"line":12,"column":5},"filename":"/cases/block-code.pug","end":{"line":12,"column":13}},"val":"string","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":13,"column":1},"filename":"/cases/block-code.pug","end":{"line":13,"column":1}}}
+{"type":"eos","loc":{"start":{"line":13,"column":1},"filename":"/cases/block-code.pug","end":{"line":13,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json b/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json
index 24c4ff968..055869e46 100644
--- a/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json
+++ b/packages/pug-parser/test/cases/block-expansion.shorthands.tokens.json
@@ -1,11 +1,11 @@
-{"type":"tag","line":1,"col":1,"val":"ul"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"li"}
-{"type":"class","line":2,"col":5,"val":"list-item"}
-{"type":":","line":2,"col":15}
-{"type":"class","line":2,"col":17,"val":"foo"}
-{"type":":","line":2,"col":21}
-{"type":"id","line":2,"col":23,"val":"bar"}
-{"type":"text","line":2,"col":28,"val":"baz"}
-{"type":"outdent","line":2,"col":31}
-{"type":"eos","line":2,"col":31}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":1,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":5}},"val":"li"}
+{"type":"class","loc":{"start":{"line":2,"column":5},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":15}},"val":"list-item"}
+{"type":":","loc":{"start":{"line":2,"column":15},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":17}}}
+{"type":"class","loc":{"start":{"line":2,"column":17},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":21}},"val":"foo"}
+{"type":":","loc":{"start":{"line":2,"column":21},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":23}}}
+{"type":"id","loc":{"start":{"line":2,"column":23},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":27}},"val":"bar"}
+{"type":"text","loc":{"start":{"line":2,"column":28},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":31}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":2,"column":31},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":31}}}
+{"type":"eos","loc":{"start":{"line":2,"column":31},"filename":"/cases/block-expansion.shorthands.pug","end":{"line":2,"column":31}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/block-expansion.tokens.json b/packages/pug-parser/test/cases/block-expansion.tokens.json
index e975377c7..c49b6599a 100644
--- a/packages/pug-parser/test/cases/block-expansion.tokens.json
+++ b/packages/pug-parser/test/cases/block-expansion.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"ul"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"li"}
-{"type":":","line":2,"col":5}
-{"type":"tag","line":2,"col":7,"val":"a"}
-{"type":"start-attributes","line":2,"col":8}
-{"type":"attribute","line":2,"col":9,"name":"href","val":"'#'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":17}
-{"type":"text","line":2,"col":19,"val":"foo"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":3,"val":"li"}
-{"type":":","line":3,"col":5}
-{"type":"tag","line":3,"col":7,"val":"a"}
-{"type":"start-attributes","line":3,"col":8}
-{"type":"attribute","line":3,"col":9,"name":"href","val":"'#'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":17}
-{"type":"text","line":3,"col":19,"val":"bar"}
-{"type":"outdent","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"p"}
-{"type":"text","line":5,"col":3,"val":"baz"}
-{"type":"eos","line":5,"col":6}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":1,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":5}},"val":"li"}
+{"type":":","loc":{"start":{"line":2,"column":5},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":7}}}
+{"type":"tag","loc":{"start":{"line":2,"column":7},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":8}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":8},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":9},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":17}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":17},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":18}}}
+{"type":"text","loc":{"start":{"line":2,"column":19},"filename":"/cases/block-expansion.pug","end":{"line":2,"column":22}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":3}}}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":5}},"val":"li"}
+{"type":":","loc":{"start":{"line":3,"column":5},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":7}}}
+{"type":"tag","loc":{"start":{"line":3,"column":7},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":8}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":8},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":9},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":17}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":17},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":18}}}
+{"type":"text","loc":{"start":{"line":3,"column":19},"filename":"/cases/block-expansion.pug","end":{"line":3,"column":22}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":5,"column":3},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":6}},"val":"baz"}
+{"type":"eos","loc":{"start":{"line":5,"column":6},"filename":"/cases/block-expansion.pug","end":{"line":5,"column":6}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blockquote.tokens.json b/packages/pug-parser/test/cases/blockquote.tokens.json
index d03499a1c..cb0b8f0c6 100644
--- a/packages/pug-parser/test/cases/blockquote.tokens.json
+++ b/packages/pug-parser/test/cases/blockquote.tokens.json
@@ -1,10 +1,10 @@
-{"type":"tag","line":1,"col":1,"val":"figure"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"blockquote"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"text","line":3,"col":7,"val":"Try to define yourself by what you do, and you&#8217;ll burnout every time. You are. That is enough. I rest in that."}
-{"type":"outdent","line":4,"col":3}
-{"type":"tag","line":4,"col":3,"val":"figcaption"}
-{"type":"text","line":4,"col":14,"val":"from @thefray at 1:43pm on May 10"}
-{"type":"outdent","line":4,"col":47}
-{"type":"eos","line":4,"col":47}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/blockquote.pug","end":{"line":1,"column":7}},"val":"figure"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/blockquote.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/blockquote.pug","end":{"line":2,"column":13}},"val":"blockquote"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/blockquote.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"text","loc":{"start":{"line":3,"column":7},"filename":"/cases/blockquote.pug","end":{"line":3,"column":123}},"val":"Try to define yourself by what you do, and you&#8217;ll burnout every time. You are. That is enough. I rest in that."}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/blockquote.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/blockquote.pug","end":{"line":4,"column":13}},"val":"figcaption"}
+{"type":"text","loc":{"start":{"line":4,"column":14},"filename":"/cases/blockquote.pug","end":{"line":4,"column":47}},"val":"from @thefray at 1:43pm on May 10"}
+{"type":"outdent","loc":{"start":{"line":4,"column":47},"filename":"/cases/blockquote.pug","end":{"line":4,"column":47}}}
+{"type":"eos","loc":{"start":{"line":4,"column":47},"filename":"/cases/blockquote.pug","end":{"line":4,"column":47}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json b/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json
index b02900153..c3cb941ea 100644
--- a/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json
+++ b/packages/pug-parser/test/cases/blocks-in-blocks.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/blocks-in-blocks-layout.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"body","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"h1"}
-{"type":"text","line":4,"col":6,"val":"Page 2"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/blocks-in-blocks.pug","end":{"line":1,"column":48}},"val":"./auxiliary/blocks-in-blocks-layout.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":3,"column":11}},"val":"body","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/blocks-in-blocks.pug","end":{"line":4,"column":5}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":4,"column":6},"filename":"/cases/blocks-in-blocks.pug","end":{"line":4,"column":12}},"val":"Page 2"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-blocks.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/blocks-in-if.tokens.json b/packages/pug-parser/test/cases/blocks-in-if.tokens.json
index cacfebd6f..3f30fc324 100644
--- a/packages/pug-parser/test/cases/blocks-in-if.tokens.json
+++ b/packages/pug-parser/test/cases/blocks-in-if.tokens.json
@@ -1,44 +1,44 @@
-{"type":"comment","line":1,"col":1,"val":" see https://github.com/pugjs/pug/issues/1589","buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"code","line":3,"col":1,"val":"var ajax = true","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"code","line":5,"col":1,"val":"if( ajax )","mustEscape":false,"buffer":false}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"comment","line":6,"col":5,"val":" return only contents if ajax requests","buffer":false}
-{"type":"newline","line":7,"col":1}
-{"type":"block","line":7,"col":5,"val":"contents","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":8}
-{"type":"tag","line":8,"col":9,"val":"p"}
-{"type":"text","line":8,"col":11,"val":"ajax contents"}
-{"type":"outdent","line":10,"col":5}
-{"type":"outdent","line":10,"col":1}
-{"type":"code","line":10,"col":1,"val":"else","mustEscape":false,"buffer":false}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"comment","line":11,"col":5,"val":" return all html","buffer":false}
-{"type":"newline","line":12,"col":1}
-{"type":"doctype","line":12,"col":5,"val":"html"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":5,"val":"html"}
-{"type":"indent","line":14,"col":1,"val":8}
-{"type":"tag","line":14,"col":9,"val":"head"}
-{"type":"indent","line":15,"col":1,"val":12}
-{"type":"tag","line":15,"col":13,"val":"meta"}
-{"type":"start-attributes","line":15,"col":17}
-{"type":"attribute","line":15,"col":19,"name":"charset","val":"'utf8'","mustEscape":true}
-{"type":"end-attributes","line":15,"col":34}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":13,"val":"title"}
-{"type":"text","line":16,"col":19,"val":"sample"}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":13,"val":"body"}
-{"type":"indent","line":18,"col":1,"val":16}
-{"type":"block","line":18,"col":17,"val":"contents","mode":"replace"}
-{"type":"indent","line":19,"col":1,"val":20}
-{"type":"tag","line":19,"col":21,"val":"p"}
-{"type":"text","line":19,"col":23,"val":"all contetns"}
-{"type":"outdent","line":20,"col":17}
-{"type":"outdent","line":20,"col":13}
-{"type":"outdent","line":20,"col":9}
-{"type":"outdent","line":20,"col":5}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":1,"column":49}},"val":" see https://github.com/pugjs/pug/issues/1589","buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":3,"column":1}}}
+{"type":"code","loc":{"start":{"line":3,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":3,"column":17}},"val":"var ajax = true","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":5,"column":1}}}
+{"type":"code","loc":{"start":{"line":5,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":5,"column":12}},"val":"if( ajax )","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"comment","loc":{"start":{"line":6,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":6,"column":46}},"val":" return only contents if ajax requests","buffer":false}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":7,"column":5}}}
+{"type":"block","loc":{"start":{"line":7,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":7,"column":19}},"val":"contents","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":8,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":8,"column":9},"filename":"/cases/blocks-in-if.pug","end":{"line":8,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":11},"filename":"/cases/blocks-in-if.pug","end":{"line":8,"column":24}},"val":"ajax contents"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":10,"column":1}}}
+{"type":"code","loc":{"start":{"line":10,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":10,"column":6}},"val":"else","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"comment","loc":{"start":{"line":11,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":11,"column":24}},"val":" return all html","buffer":false}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":12,"column":5}}}
+{"type":"doctype","loc":{"start":{"line":12,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":12,"column":17}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":13,"column":5}}}
+{"type":"tag","loc":{"start":{"line":13,"column":5},"filename":"/cases/blocks-in-if.pug","end":{"line":13,"column":9}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":14,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":14,"column":9},"filename":"/cases/blocks-in-if.pug","end":{"line":14,"column":13}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":13}},"val":12}
+{"type":"tag","loc":{"start":{"line":15,"column":13},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":17}},"val":"meta"}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":17},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":19},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":33}},"name":"charset","mustEscape":true,"val":"'utf8'"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":34},"filename":"/cases/blocks-in-if.pug","end":{"line":15,"column":35}}}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":16,"column":13}}}
+{"type":"tag","loc":{"start":{"line":16,"column":13},"filename":"/cases/blocks-in-if.pug","end":{"line":16,"column":18}},"val":"title"}
+{"type":"text","loc":{"start":{"line":16,"column":19},"filename":"/cases/blocks-in-if.pug","end":{"line":16,"column":25}},"val":"sample"}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":17,"column":13}}}
+{"type":"tag","loc":{"start":{"line":17,"column":13},"filename":"/cases/blocks-in-if.pug","end":{"line":17,"column":17}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":18,"column":17}},"val":16}
+{"type":"block","loc":{"start":{"line":18,"column":17},"filename":"/cases/blocks-in-if.pug","end":{"line":18,"column":31}},"val":"contents","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":19,"column":21}},"val":20}
+{"type":"tag","loc":{"start":{"line":19,"column":21},"filename":"/cases/blocks-in-if.pug","end":{"line":19,"column":22}},"val":"p"}
+{"type":"text","loc":{"start":{"line":19,"column":23},"filename":"/cases/blocks-in-if.pug","end":{"line":19,"column":35}},"val":"all contetns"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/blocks-in-if.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/case-blocks.tokens.json b/packages/pug-parser/test/cases/case-blocks.tokens.json
index b56e19ac6..165b477ce 100644
--- a/packages/pug-parser/test/cases/case-blocks.tokens.json
+++ b/packages/pug-parser/test/cases/case-blocks.tokens.json
@@ -1,29 +1,29 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"code","line":3,"col":5,"val":"var friends = 1","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"case","line":4,"col":5,"val":"friends"}
-{"type":"indent","line":5,"col":1,"val":6}
-{"type":"when","line":5,"col":7,"val":"0"}
-{"type":"indent","line":6,"col":1,"val":8}
-{"type":"tag","line":6,"col":9,"val":"p"}
-{"type":"text","line":6,"col":11,"val":"you have no friends"}
-{"type":"outdent","line":7,"col":7}
-{"type":"when","line":7,"col":7,"val":"1"}
-{"type":"indent","line":8,"col":1,"val":8}
-{"type":"tag","line":8,"col":9,"val":"p"}
-{"type":"text","line":8,"col":11,"val":"you have a friend"}
-{"type":"outdent","line":9,"col":7}
-{"type":"default","line":9,"col":7}
-{"type":"indent","line":10,"col":1,"val":8}
-{"type":"tag","line":10,"col":9,"val":"p"}
-{"type":"text","line":10,"col":11,"val":"you have "}
-{"type":"interpolated-code","line":10,"col":20,"val":"friends","mustEscape":true,"buffer":true}
-{"type":"text","line":10,"col":30,"val":" friends"}
-{"type":"outdent","line":10,"col":38}
-{"type":"outdent","line":10,"col":38}
-{"type":"outdent","line":10,"col":38}
-{"type":"outdent","line":10,"col":38}
-{"type":"eos","line":10,"col":38}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/case-blocks.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/case-blocks.pug","end":{"line":3,"column":22}},"val":"var friends = 1","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":4,"column":5}}}
+{"type":"case","loc":{"start":{"line":4,"column":5},"filename":"/cases/case-blocks.pug","end":{"line":4,"column":17}},"val":"friends"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":5,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":5,"column":7},"filename":"/cases/case-blocks.pug","end":{"line":5,"column":13}},"val":"0"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":6,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":6,"column":9},"filename":"/cases/case-blocks.pug","end":{"line":6,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":6,"column":11},"filename":"/cases/case-blocks.pug","end":{"line":6,"column":30}},"val":"you have no friends"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":7,"column":7}}}
+{"type":"when","loc":{"start":{"line":7,"column":7},"filename":"/cases/case-blocks.pug","end":{"line":7,"column":13}},"val":"1"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":8,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":8,"column":9},"filename":"/cases/case-blocks.pug","end":{"line":8,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":11},"filename":"/cases/case-blocks.pug","end":{"line":8,"column":28}},"val":"you have a friend"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":9,"column":7}}}
+{"type":"default","loc":{"start":{"line":9,"column":7},"filename":"/cases/case-blocks.pug","end":{"line":9,"column":14}}}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":10,"column":9},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":10,"column":11},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":20}},"val":"you have "}
+{"type":"interpolated-code","loc":{"start":{"line":10,"column":20},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":30}},"mustEscape":true,"buffer":true,"val":"friends"}
+{"type":"text","loc":{"start":{"line":10,"column":30},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}},"val":" friends"}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
+{"type":"eos","loc":{"start":{"line":10,"column":38},"filename":"/cases/case-blocks.pug","end":{"line":10,"column":38}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/case.tokens.json b/packages/pug-parser/test/cases/case.tokens.json
index cbfdcb5fd..da7847e53 100644
--- a/packages/pug-parser/test/cases/case.tokens.json
+++ b/packages/pug-parser/test/cases/case.tokens.json
@@ -1,47 +1,61 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"code","line":3,"col":5,"val":"var friends = 1","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"case","line":4,"col":5,"val":"friends"}
-{"type":"indent","line":5,"col":1,"val":6}
-{"type":"when","line":5,"col":7,"val":"0"}
-{"type":":","line":5,"col":13}
-{"type":"tag","line":5,"col":15,"val":"p"}
-{"type":"text","line":5,"col":17,"val":"you have no friends"}
-{"type":"newline","line":6,"col":1}
-{"type":"when","line":6,"col":7,"val":"1"}
-{"type":":","line":6,"col":13}
-{"type":"tag","line":6,"col":15,"val":"p"}
-{"type":"text","line":6,"col":17,"val":"you have a friend"}
-{"type":"newline","line":7,"col":1}
-{"type":"default","line":7,"col":7}
-{"type":":","line":7,"col":14}
-{"type":"tag","line":7,"col":16,"val":"p"}
-{"type":"text","line":7,"col":18,"val":"you have "}
-{"type":"interpolated-code","line":7,"col":27,"val":"friends","mustEscape":true,"buffer":true}
-{"type":"text","line":7,"col":37,"val":" friends"}
-{"type":"outdent","line":8,"col":5}
-{"type":"code","line":8,"col":5,"val":"var friends = 0","mustEscape":false,"buffer":false}
-{"type":"newline","line":9,"col":1}
-{"type":"case","line":9,"col":5,"val":"friends"}
-{"type":"indent","line":10,"col":1,"val":6}
-{"type":"when","line":10,"col":7,"val":"0"}
-{"type":"newline","line":11,"col":1}
-{"type":"when","line":11,"col":7,"val":"1"}
-{"type":"indent","line":12,"col":1,"val":8}
-{"type":"tag","line":12,"col":9,"val":"p"}
-{"type":"text","line":12,"col":11,"val":"you have very few friends"}
-{"type":"outdent","line":13,"col":7}
-{"type":"default","line":13,"col":7}
-{"type":"indent","line":14,"col":1,"val":8}
-{"type":"tag","line":14,"col":9,"val":"p"}
-{"type":"text","line":14,"col":11,"val":"you have "}
-{"type":"interpolated-code","line":14,"col":20,"val":"friends","mustEscape":true,"buffer":true}
-{"type":"text","line":14,"col":30,"val":" friends"}
-{"type":"outdent","line":14,"col":38}
-{"type":"outdent","line":14,"col":38}
-{"type":"outdent","line":14,"col":38}
-{"type":"outdent","line":14,"col":38}
-{"type":"eos","line":14,"col":38}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/case.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/case.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/case.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/case.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/case.pug","end":{"line":3,"column":22}},"val":"var friends = 1","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/case.pug","end":{"line":4,"column":5}}}
+{"type":"case","loc":{"start":{"line":4,"column":5},"filename":"/cases/case.pug","end":{"line":4,"column":17}},"val":"friends"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/case.pug","end":{"line":5,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":5,"column":7},"filename":"/cases/case.pug","end":{"line":5,"column":13}},"val":"0"}
+{"type":":","loc":{"start":{"line":5,"column":13},"filename":"/cases/case.pug","end":{"line":5,"column":15}}}
+{"type":"tag","loc":{"start":{"line":5,"column":15},"filename":"/cases/case.pug","end":{"line":5,"column":16}},"val":"p"}
+{"type":"text","loc":{"start":{"line":5,"column":17},"filename":"/cases/case.pug","end":{"line":5,"column":36}},"val":"you have no friends"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/case.pug","end":{"line":6,"column":7}}}
+{"type":"when","loc":{"start":{"line":6,"column":7},"filename":"/cases/case.pug","end":{"line":6,"column":13}},"val":"1"}
+{"type":":","loc":{"start":{"line":6,"column":13},"filename":"/cases/case.pug","end":{"line":6,"column":15}}}
+{"type":"tag","loc":{"start":{"line":6,"column":15},"filename":"/cases/case.pug","end":{"line":6,"column":16}},"val":"p"}
+{"type":"text","loc":{"start":{"line":6,"column":17},"filename":"/cases/case.pug","end":{"line":6,"column":34}},"val":"you have a friend"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/case.pug","end":{"line":7,"column":7}}}
+{"type":"default","loc":{"start":{"line":7,"column":7},"filename":"/cases/case.pug","end":{"line":7,"column":14}}}
+{"type":":","loc":{"start":{"line":7,"column":14},"filename":"/cases/case.pug","end":{"line":7,"column":16}}}
+{"type":"tag","loc":{"start":{"line":7,"column":16},"filename":"/cases/case.pug","end":{"line":7,"column":17}},"val":"p"}
+{"type":"text","loc":{"start":{"line":7,"column":18},"filename":"/cases/case.pug","end":{"line":7,"column":27}},"val":"you have "}
+{"type":"interpolated-code","loc":{"start":{"line":7,"column":27},"filename":"/cases/case.pug","end":{"line":7,"column":37}},"mustEscape":true,"buffer":true,"val":"friends"}
+{"type":"text","loc":{"start":{"line":7,"column":37},"filename":"/cases/case.pug","end":{"line":7,"column":45}},"val":" friends"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/case.pug","end":{"line":8,"column":5}}}
+{"type":"code","loc":{"start":{"line":8,"column":5},"filename":"/cases/case.pug","end":{"line":8,"column":22}},"val":"var friends = 0","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/case.pug","end":{"line":9,"column":5}}}
+{"type":"case","loc":{"start":{"line":9,"column":5},"filename":"/cases/case.pug","end":{"line":9,"column":17}},"val":"friends"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/case.pug","end":{"line":10,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":10,"column":7},"filename":"/cases/case.pug","end":{"line":10,"column":13}},"val":"0"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/case.pug","end":{"line":11,"column":7}}}
+{"type":"when","loc":{"start":{"line":11,"column":7},"filename":"/cases/case.pug","end":{"line":11,"column":13}},"val":"1"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/case.pug","end":{"line":12,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":12,"column":9},"filename":"/cases/case.pug","end":{"line":12,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":12,"column":11},"filename":"/cases/case.pug","end":{"line":12,"column":36}},"val":"you have very few friends"}
+{"type":"outdent","loc":{"start":{"line":13,"column":1},"filename":"/cases/case.pug","end":{"line":13,"column":7}}}
+{"type":"default","loc":{"start":{"line":13,"column":7},"filename":"/cases/case.pug","end":{"line":13,"column":14}}}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/case.pug","end":{"line":14,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":14,"column":9},"filename":"/cases/case.pug","end":{"line":14,"column":10}},"val":"p"}
+{"type":"text","loc":{"start":{"line":14,"column":11},"filename":"/cases/case.pug","end":{"line":14,"column":20}},"val":"you have "}
+{"type":"interpolated-code","loc":{"start":{"line":14,"column":20},"filename":"/cases/case.pug","end":{"line":14,"column":30}},"mustEscape":true,"buffer":true,"val":"friends"}
+{"type":"text","loc":{"start":{"line":14,"column":30},"filename":"/cases/case.pug","end":{"line":14,"column":38}},"val":" friends"}
+{"type":"outdent","loc":{"start":{"line":16,"column":1},"filename":"/cases/case.pug","end":{"line":16,"column":5}}}
+{"type":"outdent","loc":{"start":{"line":16,"column":1},"filename":"/cases/case.pug","end":{"line":16,"column":5}}}
+{"type":"code","loc":{"start":{"line":16,"column":5},"filename":"/cases/case.pug","end":{"line":16,"column":27}},"val":"var friend = 'Tim:G'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/case.pug","end":{"line":17,"column":5}}}
+{"type":"case","loc":{"start":{"line":17,"column":5},"filename":"/cases/case.pug","end":{"line":17,"column":16}},"val":"friend"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/case.pug","end":{"line":18,"column":7}},"val":6}
+{"type":"when","loc":{"start":{"line":18,"column":7},"filename":"/cases/case.pug","end":{"line":18,"column":19}},"val":"'Tim:G'"}
+{"type":":","loc":{"start":{"line":18,"column":19},"filename":"/cases/case.pug","end":{"line":18,"column":24}}}
+{"type":"tag","loc":{"start":{"line":18,"column":24},"filename":"/cases/case.pug","end":{"line":18,"column":25}},"val":"p"}
+{"type":"text","loc":{"start":{"line":18,"column":26},"filename":"/cases/case.pug","end":{"line":18,"column":44}},"val":"Friend is a string"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/case.pug","end":{"line":19,"column":7}}}
+{"type":"when","loc":{"start":{"line":19,"column":7},"filename":"/cases/case.pug","end":{"line":19,"column":22}},"val":"{tim: 'g'}"}
+{"type":":","loc":{"start":{"line":19,"column":22},"filename":"/cases/case.pug","end":{"line":19,"column":24}}}
+{"type":"tag","loc":{"start":{"line":19,"column":24},"filename":"/cases/case.pug","end":{"line":19,"column":25}},"val":"p"}
+{"type":"text","loc":{"start":{"line":19,"column":26},"filename":"/cases/case.pug","end":{"line":19,"column":45}},"val":"Friend is an object"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/case.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/classes-empty.tokens.json b/packages/pug-parser/test/cases/classes-empty.tokens.json
index b470ebcda..1e9fe573b 100644
--- a/packages/pug-parser/test/cases/classes-empty.tokens.json
+++ b/packages/pug-parser/test/cases/classes-empty.tokens.json
@@ -1,15 +1,15 @@
-{"type":"tag","line":1,"col":1,"val":"a"}
-{"type":"start-attributes","line":1,"col":2}
-{"type":"attribute","line":1,"col":3,"name":"class","val":"''","mustEscape":true}
-{"type":"end-attributes","line":1,"col":11}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"a"}
-{"type":"start-attributes","line":2,"col":2}
-{"type":"attribute","line":2,"col":3,"name":"class","val":"null","mustEscape":true}
-{"type":"end-attributes","line":2,"col":13}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"class","val":"undefined","mustEscape":true}
-{"type":"end-attributes","line":3,"col":18}
-{"type":"eos","line":3,"col":19}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":2},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":3},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":11}},"name":"class","mustEscape":true,"val":"''"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":11},"filename":"/cases/classes-empty.pug","end":{"line":1,"column":12}}}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":2},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":3},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":13}},"name":"class","mustEscape":true,"val":"null"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":13},"filename":"/cases/classes-empty.pug","end":{"line":2,"column":14}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":18}},"name":"class","mustEscape":true,"val":"undefined"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":18},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":19}}}
+{"type":"eos","loc":{"start":{"line":3,"column":19},"filename":"/cases/classes-empty.pug","end":{"line":3,"column":19}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/classes.tokens.json b/packages/pug-parser/test/cases/classes.tokens.json
index df6b13055..e5fc7ee0a 100644
--- a/packages/pug-parser/test/cases/classes.tokens.json
+++ b/packages/pug-parser/test/cases/classes.tokens.json
@@ -1,21 +1,27 @@
-{"type":"tag","line":1,"col":1,"val":"a"}
-{"type":"start-attributes","line":1,"col":2}
-{"type":"attribute","line":1,"col":3,"name":"class","val":"['foo', 'bar', 'baz']","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"a"}
-{"type":"class","line":5,"col":2,"val":"foo"}
-{"type":"start-attributes","line":5,"col":6}
-{"type":"attribute","line":5,"col":7,"name":"class","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":18}
-{"type":"class","line":5,"col":19,"val":"baz"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"a"}
-{"type":"class","line":9,"col":2,"val":"foo-bar_baz"}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":1,"val":"a"}
-{"type":"start-attributes","line":11,"col":2}
-{"type":"attribute","line":11,"col":3,"name":"class","val":"{foo: true, bar: false, baz: true}","mustEscape":true}
-{"type":"end-attributes","line":11,"col":43}
-{"type":"newline","line":12,"col":1}
-{"type":"eos","line":12,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/classes.pug","end":{"line":1,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":2},"filename":"/cases/classes.pug","end":{"line":1,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":3},"filename":"/cases/classes.pug","end":{"line":1,"column":30}},"name":"class","mustEscape":true,"val":"['foo', 'bar', 'baz']"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/classes.pug","end":{"line":1,"column":31}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/classes.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/classes.pug","end":{"line":5,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":5,"column":2},"filename":"/cases/classes.pug","end":{"line":5,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":6},"filename":"/cases/classes.pug","end":{"line":5,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":7},"filename":"/cases/classes.pug","end":{"line":5,"column":18}},"name":"class","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":18},"filename":"/cases/classes.pug","end":{"line":5,"column":19}}}
+{"type":"class","loc":{"start":{"line":5,"column":19},"filename":"/cases/classes.pug","end":{"line":5,"column":23}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/classes.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/classes.pug","end":{"line":9,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":9,"column":2},"filename":"/cases/classes.pug","end":{"line":9,"column":14}},"val":"foo-bar_baz"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/classes.pug","end":{"line":11,"column":1}}}
+{"type":"tag","loc":{"start":{"line":11,"column":1},"filename":"/cases/classes.pug","end":{"line":11,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":11,"column":2},"filename":"/cases/classes.pug","end":{"line":11,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":11,"column":3},"filename":"/cases/classes.pug","end":{"line":11,"column":43}},"name":"class","mustEscape":true,"val":"{foo: true, bar: false, baz: true}"}
+{"type":"end-attributes","loc":{"start":{"line":11,"column":43},"filename":"/cases/classes.pug","end":{"line":11,"column":44}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/classes.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/classes.pug","end":{"line":13,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":13,"column":2},"filename":"/cases/classes.pug","end":{"line":13,"column":7}},"val":"-foo"}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/classes.pug","end":{"line":14,"column":1}}}
+{"type":"tag","loc":{"start":{"line":14,"column":1},"filename":"/cases/classes.pug","end":{"line":14,"column":2}},"val":"a"}
+{"type":"class","loc":{"start":{"line":14,"column":2},"filename":"/cases/classes.pug","end":{"line":14,"column":7}},"val":"3foo"}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/classes.pug","end":{"line":15,"column":1}}}
+{"type":"eos","loc":{"start":{"line":15,"column":1},"filename":"/cases/classes.pug","end":{"line":15,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.conditionals.tokens.json b/packages/pug-parser/test/cases/code.conditionals.tokens.json
index 6136ca8fa..9f9d21b7b 100644
--- a/packages/pug-parser/test/cases/code.conditionals.tokens.json
+++ b/packages/pug-parser/test/cases/code.conditionals.tokens.json
@@ -1,86 +1,86 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"if (true)","mustEscape":false,"buffer":false}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"p"}
-{"type":"text","line":3,"col":5,"val":"foo"}
-{"type":"outdent","line":4,"col":1}
-{"type":"code","line":4,"col":1,"val":"else","mustEscape":false,"buffer":false}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"p"}
-{"type":"text","line":5,"col":5,"val":"bar"}
-{"type":"outdent","line":7,"col":1}
-{"type":"code","line":7,"col":1,"val":"if (true) {","mustEscape":false,"buffer":false}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"p"}
-{"type":"text","line":8,"col":5,"val":"foo"}
-{"type":"outdent","line":9,"col":1}
-{"type":"code","line":9,"col":1,"val":"} else {","mustEscape":false,"buffer":false}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"tag","line":10,"col":3,"val":"p"}
-{"type":"text","line":10,"col":5,"val":"bar"}
-{"type":"outdent","line":11,"col":1}
-{"type":"code","line":11,"col":1,"val":"}","mustEscape":false,"buffer":false}
-{"type":"newline","line":13,"col":1}
-{"type":"if","line":13,"col":1,"val":"true"}
-{"type":"indent","line":14,"col":1,"val":2}
-{"type":"tag","line":14,"col":3,"val":"p"}
-{"type":"text","line":14,"col":5,"val":"foo"}
-{"type":"newline","line":15,"col":1}
-{"type":"tag","line":15,"col":3,"val":"p"}
-{"type":"text","line":15,"col":5,"val":"bar"}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":3,"val":"p"}
-{"type":"text","line":16,"col":5,"val":"baz"}
-{"type":"outdent","line":17,"col":1}
-{"type":"else","line":17,"col":1,"val":""}
-{"type":"indent","line":18,"col":1,"val":2}
-{"type":"tag","line":18,"col":3,"val":"p"}
-{"type":"text","line":18,"col":5,"val":"bar"}
-{"type":"outdent","line":20,"col":1}
-{"type":"if","line":20,"col":1,"val":"!(true)"}
-{"type":"indent","line":21,"col":1,"val":2}
-{"type":"tag","line":21,"col":3,"val":"p"}
-{"type":"text","line":21,"col":5,"val":"foo"}
-{"type":"outdent","line":22,"col":1}
-{"type":"else","line":22,"col":1,"val":""}
-{"type":"indent","line":23,"col":1,"val":2}
-{"type":"tag","line":23,"col":3,"val":"p"}
-{"type":"text","line":23,"col":5,"val":"bar"}
-{"type":"outdent","line":25,"col":1}
-{"type":"if","line":25,"col":1,"val":"'nested'"}
-{"type":"indent","line":26,"col":1,"val":2}
-{"type":"if","line":26,"col":3,"val":"'works'"}
-{"type":"indent","line":27,"col":1,"val":4}
-{"type":"tag","line":27,"col":5,"val":"p"}
-{"type":"text","line":27,"col":7,"val":"yay"}
-{"type":"outdent","line":29,"col":3}
-{"type":"outdent","line":29,"col":1}
-{"type":"comment","line":29,"col":1,"val":" allow empty blocks","buffer":false}
-{"type":"newline","line":30,"col":1}
-{"type":"if","line":30,"col":1,"val":"false"}
-{"type":"newline","line":31,"col":1}
-{"type":"else","line":31,"col":1,"val":""}
-{"type":"indent","line":32,"col":1,"val":2}
-{"type":"class","line":32,"col":3,"val":"bar"}
-{"type":"outdent","line":33,"col":1}
-{"type":"if","line":33,"col":1,"val":"true"}
-{"type":"indent","line":34,"col":1,"val":2}
-{"type":"class","line":34,"col":3,"val":"bar"}
-{"type":"outdent","line":35,"col":1}
-{"type":"else","line":35,"col":1,"val":""}
-{"type":"newline","line":36,"col":1}
-{"type":"class","line":36,"col":1,"val":"bing"}
-{"type":"newline","line":38,"col":1}
-{"type":"if","line":38,"col":1,"val":"false"}
-{"type":"indent","line":39,"col":1,"val":2}
-{"type":"class","line":39,"col":3,"val":"bing"}
-{"type":"outdent","line":40,"col":1}
-{"type":"else-if","line":40,"col":1,"val":"false"}
-{"type":"indent","line":41,"col":1,"val":2}
-{"type":"class","line":41,"col":3,"val":"bar"}
-{"type":"outdent","line":42,"col":1}
-{"type":"else","line":42,"col":1,"val":""}
-{"type":"indent","line":43,"col":1,"val":2}
-{"type":"class","line":43,"col":3,"val":"foo"}
-{"type":"outdent","line":43,"col":7}
-{"type":"eos","line":43,"col":7}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":2,"column":12}},"val":"if (true)","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":3,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":3,"column":8}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":4,"column":1}}}
+{"type":"code","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":4,"column":7}},"val":"else","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":5,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":5,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":7,"column":1}}}
+{"type":"code","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":7,"column":14}},"val":"if (true) {","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":8,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":8,"column":8}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":9,"column":1}}}
+{"type":"code","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":9,"column":11}},"val":"} else {","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":10,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":10,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":10,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":11,"column":1}}}
+{"type":"code","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":11,"column":4}},"val":"}","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":13,"column":1}}}
+{"type":"if","loc":{"start":{"line":13,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":13,"column":8}},"val":"true"}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":14,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":14,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":14,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":14,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":14,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":15,"column":3}}}
+{"type":"tag","loc":{"start":{"line":15,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":15,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":15,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":15,"column":8}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":16,"column":3}}}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":16,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":16,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":16,"column":8}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":17,"column":1}}}
+{"type":"else","loc":{"start":{"line":17,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":17,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":18,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":18,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":18,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":18,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":18,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":20,"column":1}}}
+{"type":"if","loc":{"start":{"line":20,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":20,"column":12}},"val":"!(true)"}
+{"type":"indent","loc":{"start":{"line":21,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":21,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":21,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":21,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":21,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":21,"column":8}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":22,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":22,"column":1}}}
+{"type":"else","loc":{"start":{"line":22,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":22,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":23,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":23,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":23,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":23,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":23,"column":8}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":25,"column":1}}}
+{"type":"if","loc":{"start":{"line":25,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":25,"column":12}},"val":"'nested'"}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":26,"column":3}},"val":2}
+{"type":"if","loc":{"start":{"line":26,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":26,"column":13}},"val":"'works'"}
+{"type":"indent","loc":{"start":{"line":27,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":27,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":27,"column":5},"filename":"/cases/code.conditionals.pug","end":{"line":27,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":27,"column":7},"filename":"/cases/code.conditionals.pug","end":{"line":27,"column":10}},"val":"yay"}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":29,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":29,"column":1}}}
+{"type":"comment","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":29,"column":23}},"val":" allow empty blocks","buffer":false}
+{"type":"newline","loc":{"start":{"line":30,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":30,"column":1}}}
+{"type":"if","loc":{"start":{"line":30,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":30,"column":9}},"val":"false"}
+{"type":"newline","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":31,"column":1}}}
+{"type":"else","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":31,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":32,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":32,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":32,"column":7}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":33,"column":1}}}
+{"type":"if","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":33,"column":8}},"val":"true"}
+{"type":"indent","loc":{"start":{"line":34,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":34,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":34,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":34,"column":7}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":35,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":35,"column":1}}}
+{"type":"else","loc":{"start":{"line":35,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":35,"column":5}},"val":""}
+{"type":"newline","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":36,"column":1}}}
+{"type":"class","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":36,"column":6}},"val":"bing"}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":38,"column":1}}}
+{"type":"if","loc":{"start":{"line":38,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":38,"column":9}},"val":"false"}
+{"type":"indent","loc":{"start":{"line":39,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":39,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":39,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":39,"column":8}},"val":"bing"}
+{"type":"outdent","loc":{"start":{"line":40,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":40,"column":1}}}
+{"type":"else-if","loc":{"start":{"line":40,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":40,"column":14}},"val":"false"}
+{"type":"indent","loc":{"start":{"line":41,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":41,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":41,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":41,"column":7}},"val":"bar"}
+{"type":"outdent","loc":{"start":{"line":42,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":42,"column":1}}}
+{"type":"else","loc":{"start":{"line":42,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":42,"column":5}},"val":""}
+{"type":"indent","loc":{"start":{"line":43,"column":1},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":43,"column":3},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":7}},"val":"foo"}
+{"type":"outdent","loc":{"start":{"line":43,"column":7},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":7}}}
+{"type":"eos","loc":{"start":{"line":43,"column":7},"filename":"/cases/code.conditionals.pug","end":{"line":43,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.escape.tokens.json b/packages/pug-parser/test/cases/code.escape.tokens.json
index 4aebd6658..45fee43f0 100644
--- a/packages/pug-parser/test/cases/code.escape.tokens.json
+++ b/packages/pug-parser/test/cases/code.escape.tokens.json
@@ -1,6 +1,6 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"code","line":1,"col":2,"val":"'<script>'","mustEscape":true,"buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"code","line":2,"col":2,"val":"'<script>'","mustEscape":false,"buffer":true}
-{"type":"eos","line":2,"col":15}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/code.escape.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":1,"column":2},"filename":"/cases/code.escape.pug","end":{"line":1,"column":14}},"val":"'<script>'","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.escape.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.escape.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":2,"column":2},"filename":"/cases/code.escape.pug","end":{"line":2,"column":15}},"val":"'<script>'","mustEscape":false,"buffer":true}
+{"type":"eos","loc":{"start":{"line":2,"column":15},"filename":"/cases/code.escape.pug","end":{"line":2,"column":15}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.iteration.tokens.json b/packages/pug-parser/test/cases/code.iteration.tokens.json
index d1eb6970a..d5a4c6fd2 100644
--- a/packages/pug-parser/test/cases/code.iteration.tokens.json
+++ b/packages/pug-parser/test/cases/code.iteration.tokens.json
@@ -1,71 +1,71 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"ul"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"code","line":5,"col":3,"val":"items.forEach(function(item){","mustEscape":false,"buffer":false}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"tag","line":6,"col":5,"val":"li"}
-{"type":"code","line":6,"col":7,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"code","line":7,"col":3,"val":"})","mustEscape":false,"buffer":false}
-{"type":"outdent","line":9,"col":1}
-{"type":"code","line":9,"col":1,"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":1,"val":"ul"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"each","line":12,"col":3,"val":"item","key":"i","code":"items"}
-{"type":"indent","line":13,"col":1,"val":4}
-{"type":"tag","line":13,"col":5,"val":"li"}
-{"type":"start-attributes","line":13,"col":7}
-{"type":"attribute","line":13,"col":8,"name":"class","val":"'item-' + i","mustEscape":true}
-{"type":"end-attributes","line":13,"col":25}
-{"type":"code","line":13,"col":26,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":15,"col":3}
-{"type":"outdent","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"ul"}
-{"type":"indent","line":16,"col":1,"val":2}
-{"type":"each","line":16,"col":3,"val":"item","key":"i","code":"items"}
-{"type":"indent","line":17,"col":1,"val":4}
-{"type":"tag","line":17,"col":5,"val":"li"}
-{"type":"code","line":17,"col":7,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":19,"col":3}
-{"type":"outdent","line":19,"col":1}
-{"type":"tag","line":19,"col":1,"val":"ul"}
-{"type":"indent","line":20,"col":1,"val":2}
-{"type":"each","line":20,"col":3,"val":"$item","key":null,"code":"items"}
-{"type":"indent","line":21,"col":1,"val":4}
-{"type":"tag","line":21,"col":5,"val":"li"}
-{"type":"code","line":21,"col":7,"val":"$item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":23,"col":3}
-{"type":"outdent","line":23,"col":1}
-{"type":"code","line":23,"col":1,"val":"var nums = [1, 2, 3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":24,"col":1}
-{"type":"code","line":24,"col":1,"val":"var letters = ['a', 'b', 'c']","mustEscape":false,"buffer":false}
-{"type":"newline","line":26,"col":1}
-{"type":"tag","line":26,"col":1,"val":"ul"}
-{"type":"indent","line":27,"col":1,"val":2}
-{"type":"each","line":27,"col":3,"val":"l","key":null,"code":"letters"}
-{"type":"indent","line":28,"col":1,"val":4}
-{"type":"each","line":28,"col":5,"val":"n","key":null,"code":"nums"}
-{"type":"indent","line":29,"col":1,"val":6}
-{"type":"tag","line":29,"col":7,"val":"li"}
-{"type":"interpolated-code","line":29,"col":10,"val":"n","mustEscape":true,"buffer":true}
-{"type":"text","line":29,"col":14,"val":": "}
-{"type":"interpolated-code","line":29,"col":16,"val":"l","mustEscape":true,"buffer":true}
-{"type":"outdent","line":31,"col":5}
-{"type":"outdent","line":31,"col":3}
-{"type":"outdent","line":31,"col":1}
-{"type":"code","line":31,"col":1,"val":"var count = 1","mustEscape":false,"buffer":false}
-{"type":"newline","line":32,"col":1}
-{"type":"code","line":32,"col":1,"val":"var counter = function() { return [count++, count++, count++] }","mustEscape":false,"buffer":false}
-{"type":"newline","line":33,"col":1}
-{"type":"tag","line":33,"col":1,"val":"ul"}
-{"type":"indent","line":34,"col":1,"val":2}
-{"type":"each","line":34,"col":3,"val":"n","key":null,"code":"counter()"}
-{"type":"indent","line":35,"col":1,"val":4}
-{"type":"tag","line":35,"col":5,"val":"li"}
-{"type":"interpolated-code","line":35,"col":8,"val":"n","mustEscape":true,"buffer":true}
-{"type":"outdent","line":36,"col":3}
-{"type":"outdent","line":36,"col":1}
-{"type":"eos","line":36,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":2,"column":22}},"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":4,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"code","loc":{"start":{"line":5,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":5,"column":34}},"val":"items.forEach(function(item){","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":6,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":6,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":6,"column":13}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":7,"column":3}}}
+{"type":"code","loc":{"start":{"line":7,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":7,"column":7}},"val":"})","mustEscape":false,"buffer":false}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":9,"column":1}}}
+{"type":"code","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":9,"column":22}},"val":"var items = [1,2,3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":11,"column":1}}}
+{"type":"tag","loc":{"start":{"line":11,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":11,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":12,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":12,"column":23}},"val":"item","key":"i","code":"items"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":13,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":7}},"val":"li"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":8},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":25}},"name":"class","mustEscape":true,"val":"'item-' + i"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":25},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":26}}}
+{"type":"code","loc":{"start":{"line":13,"column":26},"filename":"/cases/code.iteration.pug","end":{"line":13,"column":32}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":15,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":16,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":16,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":16,"column":24}},"val":"item","key":"i","code":"items"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":17,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":17,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":17,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":17,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":17,"column":13}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":19,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":19,"column":1}}}
+{"type":"tag","loc":{"start":{"line":19,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":19,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":20,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":20,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":20,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":20,"column":22}},"val":"$item","key":null,"code":"items"}
+{"type":"indent","loc":{"start":{"line":21,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":21,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":21,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":21,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":21,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":21,"column":14}},"val":"$item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":23,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":23,"column":1}}}
+{"type":"code","loc":{"start":{"line":23,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":23,"column":23}},"val":"var nums = [1, 2, 3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":24,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":24,"column":1}}}
+{"type":"code","loc":{"start":{"line":24,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":24,"column":32}},"val":"var letters = ['a', 'b', 'c']","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":26,"column":1}}}
+{"type":"tag","loc":{"start":{"line":26,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":26,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":27,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":27,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":27,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":27,"column":19}},"val":"l","key":null,"code":"letters"}
+{"type":"indent","loc":{"start":{"line":28,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":28,"column":5}},"val":4}
+{"type":"each","loc":{"start":{"line":28,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":28,"column":18}},"val":"n","key":null,"code":"nums"}
+{"type":"indent","loc":{"start":{"line":29,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":29,"column":7},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":9}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":29,"column":10},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":14}},"mustEscape":true,"buffer":true,"val":"n"}
+{"type":"text","loc":{"start":{"line":29,"column":14},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":29,"column":16},"filename":"/cases/code.iteration.pug","end":{"line":29,"column":20}},"mustEscape":true,"buffer":true,"val":"l"}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":1}}}
+{"type":"code","loc":{"start":{"line":31,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":31,"column":16}},"val":"var count = 1","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":32,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":32,"column":1}}}
+{"type":"code","loc":{"start":{"line":32,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":32,"column":66}},"val":"var counter = function() { return [count++, count++, count++] }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":33,"column":1}}}
+{"type":"tag","loc":{"start":{"line":33,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":33,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":34,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":34,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":34,"column":3},"filename":"/cases/code.iteration.pug","end":{"line":34,"column":21}},"val":"n","key":null,"code":"counter()"}
+{"type":"indent","loc":{"start":{"line":35,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":35,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":35,"column":5},"filename":"/cases/code.iteration.pug","end":{"line":35,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":35,"column":8},"filename":"/cases/code.iteration.pug","end":{"line":35,"column":12}},"mustEscape":true,"buffer":true,"val":"n"}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":36,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":36,"column":1}}}
+{"type":"eos","loc":{"start":{"line":36,"column":1},"filename":"/cases/code.iteration.pug","end":{"line":36,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/code.tokens.json b/packages/pug-parser/test/cases/code.tokens.json
index 90471ea33..0d836758e 100644
--- a/packages/pug-parser/test/cases/code.tokens.json
+++ b/packages/pug-parser/test/cases/code.tokens.json
@@ -1,40 +1,40 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"code","line":1,"col":2,"val":"null","mustEscape":true,"buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"code","line":2,"col":2,"val":"undefined","mustEscape":true,"buffer":true}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"code","line":3,"col":2,"val":"''","mustEscape":true,"buffer":true}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"p"}
-{"type":"code","line":4,"col":2,"val":"0","mustEscape":true,"buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"p"}
-{"type":"code","line":5,"col":2,"val":"false","mustEscape":true,"buffer":true}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"p"}
-{"type":"start-attributes","line":6,"col":2}
-{"type":"attribute","line":6,"col":3,"name":"foo","val":"null","mustEscape":true}
-{"type":"end-attributes","line":6,"col":11}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"p"}
-{"type":"start-attributes","line":7,"col":2}
-{"type":"attribute","line":7,"col":3,"name":"foo","val":"undefined","mustEscape":true}
-{"type":"end-attributes","line":7,"col":16}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":1,"val":"p"}
-{"type":"start-attributes","line":8,"col":2}
-{"type":"attribute","line":8,"col":3,"name":"foo","val":"''","mustEscape":true}
-{"type":"end-attributes","line":8,"col":9}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"p"}
-{"type":"start-attributes","line":9,"col":2}
-{"type":"attribute","line":9,"col":3,"name":"foo","val":"0","mustEscape":true}
-{"type":"end-attributes","line":9,"col":8}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"p"}
-{"type":"start-attributes","line":10,"col":2}
-{"type":"attribute","line":10,"col":3,"name":"foo","val":"false","mustEscape":true}
-{"type":"end-attributes","line":10,"col":12}
-{"type":"eos","line":10,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/code.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":1,"column":2},"filename":"/cases/code.pug","end":{"line":1,"column":8}},"val":"null","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/code.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":2,"column":2},"filename":"/cases/code.pug","end":{"line":2,"column":13}},"val":"undefined","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/code.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/code.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":3,"column":2},"filename":"/cases/code.pug","end":{"line":3,"column":6}},"val":"''","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/code.pug","end":{"line":4,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":4,"column":2},"filename":"/cases/code.pug","end":{"line":4,"column":5}},"val":"0","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/code.pug","end":{"line":5,"column":2}},"val":"p"}
+{"type":"code","loc":{"start":{"line":5,"column":2},"filename":"/cases/code.pug","end":{"line":5,"column":9}},"val":"false","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/code.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/code.pug","end":{"line":6,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":2},"filename":"/cases/code.pug","end":{"line":6,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":3},"filename":"/cases/code.pug","end":{"line":6,"column":11}},"name":"foo","mustEscape":true,"val":"null"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":11},"filename":"/cases/code.pug","end":{"line":6,"column":12}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/code.pug","end":{"line":7,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":2},"filename":"/cases/code.pug","end":{"line":7,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":3},"filename":"/cases/code.pug","end":{"line":7,"column":16}},"name":"foo","mustEscape":true,"val":"undefined"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":16},"filename":"/cases/code.pug","end":{"line":7,"column":17}}}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/code.pug","end":{"line":8,"column":1}}}
+{"type":"tag","loc":{"start":{"line":8,"column":1},"filename":"/cases/code.pug","end":{"line":8,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":2},"filename":"/cases/code.pug","end":{"line":8,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":3},"filename":"/cases/code.pug","end":{"line":8,"column":9}},"name":"foo","mustEscape":true,"val":"''"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":9},"filename":"/cases/code.pug","end":{"line":8,"column":10}}}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/code.pug","end":{"line":9,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":2},"filename":"/cases/code.pug","end":{"line":9,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":3},"filename":"/cases/code.pug","end":{"line":9,"column":8}},"name":"foo","mustEscape":true,"val":"0"}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":8},"filename":"/cases/code.pug","end":{"line":9,"column":9}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/code.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/code.pug","end":{"line":10,"column":2}},"val":"p"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":2},"filename":"/cases/code.pug","end":{"line":10,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":3},"filename":"/cases/code.pug","end":{"line":10,"column":12}},"name":"foo","mustEscape":true,"val":"false"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":12},"filename":"/cases/code.pug","end":{"line":10,"column":13}}}
+{"type":"eos","loc":{"start":{"line":10,"column":13},"filename":"/cases/code.pug","end":{"line":10,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/comments-in-case.tokens.json b/packages/pug-parser/test/cases/comments-in-case.tokens.json
index 9ad2cd2b2..5dd9ffb93 100644
--- a/packages/pug-parser/test/cases/comments-in-case.tokens.json
+++ b/packages/pug-parser/test/cases/comments-in-case.tokens.json
@@ -1,26 +1,26 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"body"}
-{"type":"indent","line":4,"col":1,"val":3}
-{"type":"code","line":4,"col":4,"val":"var s = 'this'","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"case","line":5,"col":4,"val":"s"}
-{"type":"indent","line":6,"col":1,"val":5}
-{"type":"comment","line":6,"col":6,"val":" Comment","buffer":false}
-{"type":"newline","line":7,"col":1}
-{"type":"when","line":7,"col":6,"val":"'this'"}
-{"type":"indent","line":8,"col":1,"val":7}
-{"type":"tag","line":8,"col":8,"val":"p"}
-{"type":"text","line":8,"col":10,"val":"It's this!"}
-{"type":"outdent","line":9,"col":6}
-{"type":"when","line":9,"col":6,"val":"'that'"}
-{"type":"indent","line":10,"col":1,"val":7}
-{"type":"tag","line":10,"col":8,"val":"p"}
-{"type":"text","line":10,"col":10,"val":"It's that!"}
-{"type":"outdent","line":10,"col":20}
-{"type":"outdent","line":10,"col":20}
-{"type":"outdent","line":10,"col":20}
-{"type":"outdent","line":10,"col":20}
-{"type":"eos","line":10,"col":20}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/comments-in-case.pug","end":{"line":3,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":4,"column":4}},"val":3}
+{"type":"code","loc":{"start":{"line":4,"column":4},"filename":"/cases/comments-in-case.pug","end":{"line":4,"column":20}},"val":"var s = 'this'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":5,"column":4}}}
+{"type":"case","loc":{"start":{"line":5,"column":4},"filename":"/cases/comments-in-case.pug","end":{"line":5,"column":10}},"val":"s"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":6,"column":6}},"val":5}
+{"type":"comment","loc":{"start":{"line":6,"column":6},"filename":"/cases/comments-in-case.pug","end":{"line":6,"column":17}},"val":" Comment","buffer":false}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":7,"column":6}}}
+{"type":"when","loc":{"start":{"line":7,"column":6},"filename":"/cases/comments-in-case.pug","end":{"line":7,"column":17}},"val":"'this'"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":8,"column":8}},"val":7}
+{"type":"tag","loc":{"start":{"line":8,"column":8},"filename":"/cases/comments-in-case.pug","end":{"line":8,"column":9}},"val":"p"}
+{"type":"text","loc":{"start":{"line":8,"column":10},"filename":"/cases/comments-in-case.pug","end":{"line":8,"column":20}},"val":"It's this!"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":9,"column":6}}}
+{"type":"when","loc":{"start":{"line":9,"column":6},"filename":"/cases/comments-in-case.pug","end":{"line":9,"column":17}},"val":"'that'"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":8}},"val":7}
+{"type":"tag","loc":{"start":{"line":10,"column":8},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":9}},"val":"p"}
+{"type":"text","loc":{"start":{"line":10,"column":10},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}},"val":"It's that!"}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
+{"type":"eos","loc":{"start":{"line":10,"column":20},"filename":"/cases/comments-in-case.pug","end":{"line":10,"column":20}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/comments.source.tokens.json b/packages/pug-parser/test/cases/comments.source.tokens.json
index b73465324..d4f31e28a 100644
--- a/packages/pug-parser/test/cases/comments.source.tokens.json
+++ b/packages/pug-parser/test/cases/comments.source.tokens.json
@@ -1,18 +1,18 @@
-{"type":"comment","line":1,"col":1,"val":"","buffer":false}
-{"type":"start-pipeless-text","line":1,"col":4}
-{"type":"text","line":2,"col":3,"val":"s/s."}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":""}
-{"type":"end-pipeless-text","line":3,"col":3}
-{"type":"newline","line":4,"col":1}
-{"type":"comment","line":4,"col":1,"val":" test/cases/comments.source.pug","buffer":false}
-{"type":"newline","line":6,"col":1}
-{"type":"comment","line":6,"col":1,"val":"","buffer":false}
-{"type":"start-pipeless-text","line":6,"col":4}
-{"type":"text","line":7,"col":3,"val":"test/cases/comments.source.pug"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"when"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":"()"}
-{"type":"end-pipeless-text","line":9,"col":5}
-{"type":"eos","line":9,"col":5}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/comments.source.pug","end":{"line":1,"column":4}},"val":"","buffer":false}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":4},"filename":"/cases/comments.source.pug","end":{"line":1,"column":4}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/comments.source.pug","end":{"line":2,"column":7}},"val":"s/s."}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.source.pug","end":{"line":3,"column":1}}}
+{"type":"text","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.source.pug","end":{"line":3,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.source.pug","end":{"line":3,"column":1}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments.source.pug","end":{"line":4,"column":1}}}
+{"type":"comment","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments.source.pug","end":{"line":4,"column":35}},"val":" test/cases/comments.source.pug","buffer":false}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments.source.pug","end":{"line":6,"column":1}}}
+{"type":"comment","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments.source.pug","end":{"line":6,"column":4}},"val":"","buffer":false}
+{"type":"start-pipeless-text","loc":{"start":{"line":6,"column":4},"filename":"/cases/comments.source.pug","end":{"line":6,"column":4}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/comments.source.pug","end":{"line":7,"column":33}},"val":"test/cases/comments.source.pug"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/comments.source.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/comments.source.pug","end":{"line":8,"column":7}},"val":"when"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments.source.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":3},"filename":"/cases/comments.source.pug","end":{"line":9,"column":5}},"val":"()"}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":5},"filename":"/cases/comments.source.pug","end":{"line":9,"column":5}}}
+{"type":"eos","loc":{"start":{"line":9,"column":5},"filename":"/cases/comments.source.pug","end":{"line":9,"column":5}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/comments.tokens.json b/packages/pug-parser/test/cases/comments.tokens.json
index 4c377bfeb..84920ddc8 100644
--- a/packages/pug-parser/test/cases/comments.tokens.json
+++ b/packages/pug-parser/test/cases/comments.tokens.json
@@ -1,61 +1,61 @@
-{"type":"newline","line":2,"col":1}
-{"type":"comment","line":2,"col":1,"val":" foo","buffer":true}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"ul"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"comment","line":4,"col":3,"val":" bar","buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"li"}
-{"type":"text","line":5,"col":6,"val":"one"}
-{"type":"newline","line":6,"col":1}
-{"type":"comment","line":6,"col":3,"val":" baz","buffer":true}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":3,"val":"li"}
-{"type":"text","line":7,"col":6,"val":"two"}
-{"type":"outdent","line":9,"col":1}
-{"type":"comment","line":9,"col":1,"val":"","buffer":true}
-{"type":"start-pipeless-text","line":9,"col":3}
-{"type":"text","line":10,"col":3,"val":"ul"}
-{"type":"newline","line":11,"col":1}
-{"type":"text","line":11,"col":3,"val":"  li foo"}
-{"type":"newline","line":12,"col":1}
-{"type":"text","line":12,"col":3,"val":""}
-{"type":"end-pipeless-text","line":12,"col":3}
-{"type":"newline","line":13,"col":1}
-{"type":"comment","line":13,"col":1,"val":" block","buffer":true}
-{"type":"start-pipeless-text","line":13,"col":9}
-{"type":"text","line":14,"col":3,"val":"// inline follow"}
-{"type":"newline","line":15,"col":1}
-{"type":"text","line":15,"col":3,"val":"li three"}
-{"type":"newline","line":16,"col":1}
-{"type":"text","line":16,"col":3,"val":""}
-{"type":"end-pipeless-text","line":16,"col":3}
-{"type":"newline","line":17,"col":1}
-{"type":"comment","line":17,"col":1,"val":" block","buffer":true}
-{"type":"start-pipeless-text","line":17,"col":9}
-{"type":"text","line":18,"col":3,"val":"// inline followed by tags"}
-{"type":"newline","line":19,"col":1}
-{"type":"text","line":19,"col":3,"val":"ul"}
-{"type":"newline","line":20,"col":1}
-{"type":"text","line":20,"col":3,"val":"  li four"}
-{"type":"newline","line":21,"col":1}
-{"type":"text","line":21,"col":3,"val":""}
-{"type":"end-pipeless-text","line":21,"col":3}
-{"type":"newline","line":22,"col":1}
-{"type":"comment","line":22,"col":1,"val":"if IE lt 9","buffer":true}
-{"type":"start-pipeless-text","line":22,"col":13}
-{"type":"text","line":23,"col":3,"val":"// inline"}
-{"type":"newline","line":24,"col":1}
-{"type":"text","line":24,"col":3,"val":"script(src='/lame.js')"}
-{"type":"newline","line":25,"col":1}
-{"type":"text","line":25,"col":3,"val":"// end-inline"}
-{"type":"newline","line":26,"col":1}
-{"type":"text","line":26,"col":3,"val":""}
-{"type":"end-pipeless-text","line":26,"col":3}
-{"type":"newline","line":27,"col":1}
-{"type":"tag","line":27,"col":1,"val":"p"}
-{"type":"text","line":27,"col":3,"val":"five"}
-{"type":"newline","line":29,"col":1}
-{"type":"class","line":29,"col":1,"val":"foo"}
-{"type":"text","line":29,"col":6,"val":"// not a comment"}
-{"type":"eos","line":29,"col":22}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments.pug","end":{"line":2,"column":1}}}
+{"type":"comment","loc":{"start":{"line":2,"column":1},"filename":"/cases/comments.pug","end":{"line":2,"column":7}},"val":" foo","buffer":true}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/comments.pug","end":{"line":3,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/comments.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"comment","loc":{"start":{"line":4,"column":3},"filename":"/cases/comments.pug","end":{"line":4,"column":9}},"val":" bar","buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/comments.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/comments.pug","end":{"line":5,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":5,"column":6},"filename":"/cases/comments.pug","end":{"line":5,"column":9}},"val":"one"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/comments.pug","end":{"line":6,"column":3}}}
+{"type":"comment","loc":{"start":{"line":6,"column":3},"filename":"/cases/comments.pug","end":{"line":6,"column":9}},"val":" baz","buffer":true}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/comments.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/comments.pug","end":{"line":7,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":7,"column":6},"filename":"/cases/comments.pug","end":{"line":7,"column":9}},"val":"two"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments.pug","end":{"line":9,"column":1}}}
+{"type":"comment","loc":{"start":{"line":9,"column":1},"filename":"/cases/comments.pug","end":{"line":9,"column":3}},"val":"","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":9,"column":3},"filename":"/cases/comments.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":10,"column":3},"filename":"/cases/comments.pug","end":{"line":10,"column":5}},"val":"ul"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/comments.pug","end":{"line":11,"column":3}}}
+{"type":"text","loc":{"start":{"line":11,"column":3},"filename":"/cases/comments.pug","end":{"line":11,"column":11}},"val":"  li foo"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/comments.pug","end":{"line":12,"column":1}}}
+{"type":"text","loc":{"start":{"line":12,"column":1},"filename":"/cases/comments.pug","end":{"line":12,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":12,"column":1},"filename":"/cases/comments.pug","end":{"line":12,"column":1}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/comments.pug","end":{"line":13,"column":1}}}
+{"type":"comment","loc":{"start":{"line":13,"column":1},"filename":"/cases/comments.pug","end":{"line":13,"column":9}},"val":" block","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":13,"column":9},"filename":"/cases/comments.pug","end":{"line":13,"column":9}}}
+{"type":"text","loc":{"start":{"line":14,"column":3},"filename":"/cases/comments.pug","end":{"line":14,"column":19}},"val":"// inline follow"}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/comments.pug","end":{"line":15,"column":3}}}
+{"type":"text","loc":{"start":{"line":15,"column":3},"filename":"/cases/comments.pug","end":{"line":15,"column":11}},"val":"li three"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/comments.pug","end":{"line":16,"column":1}}}
+{"type":"text","loc":{"start":{"line":16,"column":1},"filename":"/cases/comments.pug","end":{"line":16,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":16,"column":1},"filename":"/cases/comments.pug","end":{"line":16,"column":1}}}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/comments.pug","end":{"line":17,"column":1}}}
+{"type":"comment","loc":{"start":{"line":17,"column":1},"filename":"/cases/comments.pug","end":{"line":17,"column":9}},"val":" block","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":17,"column":9},"filename":"/cases/comments.pug","end":{"line":17,"column":9}}}
+{"type":"text","loc":{"start":{"line":18,"column":3},"filename":"/cases/comments.pug","end":{"line":18,"column":29}},"val":"// inline followed by tags"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/comments.pug","end":{"line":19,"column":3}}}
+{"type":"text","loc":{"start":{"line":19,"column":3},"filename":"/cases/comments.pug","end":{"line":19,"column":5}},"val":"ul"}
+{"type":"newline","loc":{"start":{"line":20,"column":1},"filename":"/cases/comments.pug","end":{"line":20,"column":3}}}
+{"type":"text","loc":{"start":{"line":20,"column":3},"filename":"/cases/comments.pug","end":{"line":20,"column":12}},"val":"  li four"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/comments.pug","end":{"line":21,"column":1}}}
+{"type":"text","loc":{"start":{"line":21,"column":1},"filename":"/cases/comments.pug","end":{"line":21,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":21,"column":1},"filename":"/cases/comments.pug","end":{"line":21,"column":1}}}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/comments.pug","end":{"line":22,"column":1}}}
+{"type":"comment","loc":{"start":{"line":22,"column":1},"filename":"/cases/comments.pug","end":{"line":22,"column":13}},"val":"if IE lt 9","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":22,"column":13},"filename":"/cases/comments.pug","end":{"line":22,"column":13}}}
+{"type":"text","loc":{"start":{"line":23,"column":3},"filename":"/cases/comments.pug","end":{"line":23,"column":12}},"val":"// inline"}
+{"type":"newline","loc":{"start":{"line":24,"column":1},"filename":"/cases/comments.pug","end":{"line":24,"column":3}}}
+{"type":"text","loc":{"start":{"line":24,"column":3},"filename":"/cases/comments.pug","end":{"line":24,"column":25}},"val":"script(src='/lame.js')"}
+{"type":"newline","loc":{"start":{"line":25,"column":1},"filename":"/cases/comments.pug","end":{"line":25,"column":3}}}
+{"type":"text","loc":{"start":{"line":25,"column":3},"filename":"/cases/comments.pug","end":{"line":25,"column":16}},"val":"// end-inline"}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/comments.pug","end":{"line":26,"column":1}}}
+{"type":"text","loc":{"start":{"line":26,"column":1},"filename":"/cases/comments.pug","end":{"line":26,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":26,"column":1},"filename":"/cases/comments.pug","end":{"line":26,"column":1}}}
+{"type":"newline","loc":{"start":{"line":27,"column":1},"filename":"/cases/comments.pug","end":{"line":27,"column":1}}}
+{"type":"tag","loc":{"start":{"line":27,"column":1},"filename":"/cases/comments.pug","end":{"line":27,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":27,"column":3},"filename":"/cases/comments.pug","end":{"line":27,"column":7}},"val":"five"}
+{"type":"newline","loc":{"start":{"line":29,"column":1},"filename":"/cases/comments.pug","end":{"line":29,"column":1}}}
+{"type":"class","loc":{"start":{"line":29,"column":1},"filename":"/cases/comments.pug","end":{"line":29,"column":5}},"val":"foo"}
+{"type":"text","loc":{"start":{"line":29,"column":6},"filename":"/cases/comments.pug","end":{"line":29,"column":22}},"val":"// not a comment"}
+{"type":"eos","loc":{"start":{"line":29,"column":22},"filename":"/cases/comments.pug","end":{"line":29,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/doctype.custom.tokens.json b/packages/pug-parser/test/cases/doctype.custom.tokens.json
index ebec09790..b202f8217 100644
--- a/packages/pug-parser/test/cases/doctype.custom.tokens.json
+++ b/packages/pug-parser/test/cases/doctype.custom.tokens.json
@@ -1,2 +1,2 @@
-{"type":"doctype","line":1,"col":1,"val":"custom stuff"}
-{"type":"eos","line":1,"col":21}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/doctype.custom.pug","end":{"line":1,"column":21}},"val":"custom stuff"}
+{"type":"eos","loc":{"start":{"line":1,"column":21},"filename":"/cases/doctype.custom.pug","end":{"line":1,"column":21}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/doctype.default.tokens.json b/packages/pug-parser/test/cases/doctype.default.tokens.json
index 1ef74954f..391f61585 100644
--- a/packages/pug-parser/test/cases/doctype.default.tokens.json
+++ b/packages/pug-parser/test/cases/doctype.default.tokens.json
@@ -1,11 +1,11 @@
-{"type":"doctype","line":1,"col":1,"val":""}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"body"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"h1"}
-{"type":"text","line":4,"col":8,"val":"Title"}
-{"type":"outdent","line":4,"col":13}
-{"type":"outdent","line":4,"col":13}
-{"type":"eos","line":4,"col":13}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":1,"column":8}},"val":""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/doctype.default.pug","end":{"line":3,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":4,"column":8},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}},"val":"Title"}
+{"type":"outdent","loc":{"start":{"line":4,"column":13},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":13},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}}}
+{"type":"eos","loc":{"start":{"line":4,"column":13},"filename":"/cases/doctype.default.pug","end":{"line":4,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/doctype.keyword.tokens.json b/packages/pug-parser/test/cases/doctype.keyword.tokens.json
index 6ca25700c..aced767a4 100644
--- a/packages/pug-parser/test/cases/doctype.keyword.tokens.json
+++ b/packages/pug-parser/test/cases/doctype.keyword.tokens.json
@@ -1,2 +1,2 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"eos","line":1,"col":13}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/doctype.keyword.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"eos","loc":{"start":{"line":1,"column":13},"filename":"/cases/doctype.keyword.pug","end":{"line":1,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/each.else.tokens.json b/packages/pug-parser/test/cases/each.else.tokens.json
index 432b7c982..6e6e68a15 100644
--- a/packages/pug-parser/test/cases/each.else.tokens.json
+++ b/packages/pug-parser/test/cases/each.else.tokens.json
@@ -1,88 +1,88 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var users = []","mustEscape":false,"buffer":false}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"ul"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"each","line":5,"col":3,"val":"user","key":null,"code":"users"}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"tag","line":6,"col":5,"val":"li"}
-{"type":"code","line":6,"col":7,"val":"user.name","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"else","line":7,"col":3,"val":""}
-{"type":"indent","line":8,"col":1,"val":4}
-{"type":"tag","line":8,"col":5,"val":"li"}
-{"type":"text","line":8,"col":8,"val":"no users!"}
-{"type":"outdent","line":11,"col":3}
-{"type":"outdent","line":11,"col":1}
-{"type":"code","line":11,"col":1,"val":"var users = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]","mustEscape":false,"buffer":false}
-{"type":"newline","line":13,"col":1}
-{"type":"if","line":13,"col":1,"val":"users"}
-{"type":"indent","line":14,"col":1,"val":2}
-{"type":"tag","line":14,"col":3,"val":"ul"}
-{"type":"indent","line":15,"col":1,"val":4}
-{"type":"each","line":15,"col":5,"val":"user","key":null,"code":"users"}
-{"type":"indent","line":16,"col":1,"val":6}
-{"type":"tag","line":16,"col":7,"val":"li"}
-{"type":"code","line":16,"col":9,"val":"user.name","mustEscape":true,"buffer":true}
-{"type":"outdent","line":17,"col":5}
-{"type":"else","line":17,"col":5,"val":""}
-{"type":"indent","line":18,"col":1,"val":6}
-{"type":"tag","line":18,"col":7,"val":"li"}
-{"type":"text","line":18,"col":10,"val":"no users!"}
-{"type":"outdent","line":20,"col":5}
-{"type":"outdent","line":20,"col":3}
-{"type":"outdent","line":20,"col":1}
-{"type":"code","line":20,"col":1,"val":"var user = { name: 'tobi', age: 10 }","mustEscape":false,"buffer":false}
-{"type":"newline","line":22,"col":1}
-{"type":"tag","line":22,"col":1,"val":"ul"}
-{"type":"indent","line":23,"col":1,"val":2}
-{"type":"each","line":23,"col":3,"val":"val","key":"key","code":"user"}
-{"type":"indent","line":24,"col":1,"val":4}
-{"type":"tag","line":24,"col":5,"val":"li"}
-{"type":"interpolated-code","line":24,"col":8,"val":"key","mustEscape":true,"buffer":true}
-{"type":"text","line":24,"col":14,"val":": "}
-{"type":"interpolated-code","line":24,"col":16,"val":"val","mustEscape":true,"buffer":true}
-{"type":"outdent","line":25,"col":3}
-{"type":"else","line":25,"col":3,"val":""}
-{"type":"indent","line":26,"col":1,"val":4}
-{"type":"tag","line":26,"col":5,"val":"li"}
-{"type":"text","line":26,"col":8,"val":"user has no details!"}
-{"type":"outdent","line":28,"col":3}
-{"type":"outdent","line":28,"col":1}
-{"type":"code","line":28,"col":1,"val":"var user = {}","mustEscape":false,"buffer":false}
-{"type":"newline","line":30,"col":1}
-{"type":"tag","line":30,"col":1,"val":"ul"}
-{"type":"indent","line":31,"col":1,"val":2}
-{"type":"each","line":31,"col":3,"val":"prop","key":"key","code":"user"}
-{"type":"indent","line":32,"col":1,"val":4}
-{"type":"tag","line":32,"col":5,"val":"li"}
-{"type":"interpolated-code","line":32,"col":8,"val":"key","mustEscape":true,"buffer":true}
-{"type":"text","line":32,"col":14,"val":": "}
-{"type":"interpolated-code","line":32,"col":16,"val":"val","mustEscape":true,"buffer":true}
-{"type":"outdent","line":33,"col":3}
-{"type":"else","line":33,"col":3,"val":""}
-{"type":"indent","line":34,"col":1,"val":4}
-{"type":"tag","line":34,"col":5,"val":"li"}
-{"type":"text","line":34,"col":8,"val":"user has no details!"}
-{"type":"outdent","line":36,"col":3}
-{"type":"outdent","line":36,"col":1}
-{"type":"code","line":36,"col":1,"val":"var user = Object.create(null)","mustEscape":false,"buffer":false}
-{"type":"newline","line":37,"col":1}
-{"type":"code","line":37,"col":1,"val":"user.name = 'tobi'","mustEscape":false,"buffer":false}
-{"type":"newline","line":39,"col":1}
-{"type":"tag","line":39,"col":1,"val":"ul"}
-{"type":"indent","line":40,"col":1,"val":2}
-{"type":"each","line":40,"col":3,"val":"val","key":"key","code":"user"}
-{"type":"indent","line":41,"col":1,"val":4}
-{"type":"tag","line":41,"col":5,"val":"li"}
-{"type":"interpolated-code","line":41,"col":8,"val":"key","mustEscape":true,"buffer":true}
-{"type":"text","line":41,"col":14,"val":": "}
-{"type":"interpolated-code","line":41,"col":16,"val":"val","mustEscape":true,"buffer":true}
-{"type":"outdent","line":42,"col":3}
-{"type":"else","line":42,"col":3,"val":""}
-{"type":"indent","line":43,"col":1,"val":4}
-{"type":"tag","line":43,"col":5,"val":"li"}
-{"type":"text","line":43,"col":8,"val":"user has no details!"}
-{"type":"outdent","line":44,"col":3}
-{"type":"outdent","line":44,"col":1}
-{"type":"eos","line":44,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/each.else.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/each.else.pug","end":{"line":2,"column":17}},"val":"var users = []","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/each.else.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/each.else.pug","end":{"line":4,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/each.else.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":5,"column":3},"filename":"/cases/each.else.pug","end":{"line":5,"column":20}},"val":"user","key":null,"code":"users"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/each.else.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/each.else.pug","end":{"line":6,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":6,"column":7},"filename":"/cases/each.else.pug","end":{"line":6,"column":18}},"val":"user.name","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/each.else.pug","end":{"line":7,"column":3}}}
+{"type":"else","loc":{"start":{"line":7,"column":3},"filename":"/cases/each.else.pug","end":{"line":7,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/each.else.pug","end":{"line":8,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":8,"column":5},"filename":"/cases/each.else.pug","end":{"line":8,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":8,"column":8},"filename":"/cases/each.else.pug","end":{"line":8,"column":17}},"val":"no users!"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/each.else.pug","end":{"line":11,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/each.else.pug","end":{"line":11,"column":1}}}
+{"type":"code","loc":{"start":{"line":11,"column":1},"filename":"/cases/each.else.pug","end":{"line":11,"column":70}},"val":"var users = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/each.else.pug","end":{"line":13,"column":1}}}
+{"type":"if","loc":{"start":{"line":13,"column":1},"filename":"/cases/each.else.pug","end":{"line":13,"column":9}},"val":"users"}
+{"type":"indent","loc":{"start":{"line":14,"column":1},"filename":"/cases/each.else.pug","end":{"line":14,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":14,"column":3},"filename":"/cases/each.else.pug","end":{"line":14,"column":5}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/each.else.pug","end":{"line":15,"column":5}},"val":4}
+{"type":"each","loc":{"start":{"line":15,"column":5},"filename":"/cases/each.else.pug","end":{"line":15,"column":22}},"val":"user","key":null,"code":"users"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/each.else.pug","end":{"line":16,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":16,"column":7},"filename":"/cases/each.else.pug","end":{"line":16,"column":9}},"val":"li"}
+{"type":"code","loc":{"start":{"line":16,"column":9},"filename":"/cases/each.else.pug","end":{"line":16,"column":20}},"val":"user.name","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/each.else.pug","end":{"line":17,"column":5}}}
+{"type":"else","loc":{"start":{"line":17,"column":5},"filename":"/cases/each.else.pug","end":{"line":17,"column":9}},"val":""}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/each.else.pug","end":{"line":18,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":18,"column":7},"filename":"/cases/each.else.pug","end":{"line":18,"column":9}},"val":"li"}
+{"type":"text","loc":{"start":{"line":18,"column":10},"filename":"/cases/each.else.pug","end":{"line":18,"column":19}},"val":"no users!"}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":1}}}
+{"type":"code","loc":{"start":{"line":20,"column":1},"filename":"/cases/each.else.pug","end":{"line":20,"column":39}},"val":"var user = { name: 'tobi', age: 10 }","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/each.else.pug","end":{"line":22,"column":1}}}
+{"type":"tag","loc":{"start":{"line":22,"column":1},"filename":"/cases/each.else.pug","end":{"line":22,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":23,"column":1},"filename":"/cases/each.else.pug","end":{"line":23,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":23,"column":3},"filename":"/cases/each.else.pug","end":{"line":23,"column":24}},"val":"val","key":"key","code":"user"}
+{"type":"indent","loc":{"start":{"line":24,"column":1},"filename":"/cases/each.else.pug","end":{"line":24,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":24,"column":5},"filename":"/cases/each.else.pug","end":{"line":24,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":24,"column":8},"filename":"/cases/each.else.pug","end":{"line":24,"column":14}},"mustEscape":true,"buffer":true,"val":"key"}
+{"type":"text","loc":{"start":{"line":24,"column":14},"filename":"/cases/each.else.pug","end":{"line":24,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":24,"column":16},"filename":"/cases/each.else.pug","end":{"line":24,"column":22}},"mustEscape":true,"buffer":true,"val":"val"}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/each.else.pug","end":{"line":25,"column":3}}}
+{"type":"else","loc":{"start":{"line":25,"column":3},"filename":"/cases/each.else.pug","end":{"line":25,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/each.else.pug","end":{"line":26,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":26,"column":5},"filename":"/cases/each.else.pug","end":{"line":26,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":26,"column":8},"filename":"/cases/each.else.pug","end":{"line":26,"column":28}},"val":"user has no details!"}
+{"type":"outdent","loc":{"start":{"line":28,"column":1},"filename":"/cases/each.else.pug","end":{"line":28,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":28,"column":1},"filename":"/cases/each.else.pug","end":{"line":28,"column":1}}}
+{"type":"code","loc":{"start":{"line":28,"column":1},"filename":"/cases/each.else.pug","end":{"line":28,"column":16}},"val":"var user = {}","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":30,"column":1},"filename":"/cases/each.else.pug","end":{"line":30,"column":1}}}
+{"type":"tag","loc":{"start":{"line":30,"column":1},"filename":"/cases/each.else.pug","end":{"line":30,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":31,"column":1},"filename":"/cases/each.else.pug","end":{"line":31,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":31,"column":3},"filename":"/cases/each.else.pug","end":{"line":31,"column":25}},"val":"prop","key":"key","code":"user"}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/each.else.pug","end":{"line":32,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":32,"column":5},"filename":"/cases/each.else.pug","end":{"line":32,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":32,"column":8},"filename":"/cases/each.else.pug","end":{"line":32,"column":14}},"mustEscape":true,"buffer":true,"val":"key"}
+{"type":"text","loc":{"start":{"line":32,"column":14},"filename":"/cases/each.else.pug","end":{"line":32,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":32,"column":16},"filename":"/cases/each.else.pug","end":{"line":32,"column":22}},"mustEscape":true,"buffer":true,"val":"val"}
+{"type":"outdent","loc":{"start":{"line":33,"column":1},"filename":"/cases/each.else.pug","end":{"line":33,"column":3}}}
+{"type":"else","loc":{"start":{"line":33,"column":3},"filename":"/cases/each.else.pug","end":{"line":33,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":34,"column":1},"filename":"/cases/each.else.pug","end":{"line":34,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":34,"column":5},"filename":"/cases/each.else.pug","end":{"line":34,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":34,"column":8},"filename":"/cases/each.else.pug","end":{"line":34,"column":28}},"val":"user has no details!"}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/each.else.pug","end":{"line":36,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/each.else.pug","end":{"line":36,"column":1}}}
+{"type":"code","loc":{"start":{"line":36,"column":1},"filename":"/cases/each.else.pug","end":{"line":36,"column":33}},"val":"var user = Object.create(null)","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":37,"column":1},"filename":"/cases/each.else.pug","end":{"line":37,"column":1}}}
+{"type":"code","loc":{"start":{"line":37,"column":1},"filename":"/cases/each.else.pug","end":{"line":37,"column":21}},"val":"user.name = 'tobi'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":39,"column":1},"filename":"/cases/each.else.pug","end":{"line":39,"column":1}}}
+{"type":"tag","loc":{"start":{"line":39,"column":1},"filename":"/cases/each.else.pug","end":{"line":39,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":40,"column":1},"filename":"/cases/each.else.pug","end":{"line":40,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":40,"column":3},"filename":"/cases/each.else.pug","end":{"line":40,"column":24}},"val":"val","key":"key","code":"user"}
+{"type":"indent","loc":{"start":{"line":41,"column":1},"filename":"/cases/each.else.pug","end":{"line":41,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":41,"column":5},"filename":"/cases/each.else.pug","end":{"line":41,"column":7}},"val":"li"}
+{"type":"interpolated-code","loc":{"start":{"line":41,"column":8},"filename":"/cases/each.else.pug","end":{"line":41,"column":14}},"mustEscape":true,"buffer":true,"val":"key"}
+{"type":"text","loc":{"start":{"line":41,"column":14},"filename":"/cases/each.else.pug","end":{"line":41,"column":16}},"val":": "}
+{"type":"interpolated-code","loc":{"start":{"line":41,"column":16},"filename":"/cases/each.else.pug","end":{"line":41,"column":22}},"mustEscape":true,"buffer":true,"val":"val"}
+{"type":"outdent","loc":{"start":{"line":42,"column":1},"filename":"/cases/each.else.pug","end":{"line":42,"column":3}}}
+{"type":"else","loc":{"start":{"line":42,"column":3},"filename":"/cases/each.else.pug","end":{"line":42,"column":7}},"val":""}
+{"type":"indent","loc":{"start":{"line":43,"column":1},"filename":"/cases/each.else.pug","end":{"line":43,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":43,"column":5},"filename":"/cases/each.else.pug","end":{"line":43,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":43,"column":8},"filename":"/cases/each.else.pug","end":{"line":43,"column":28}},"val":"user has no details!"}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/each.else.pug","end":{"line":44,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/each.else.pug","end":{"line":44,"column":1}}}
+{"type":"eos","loc":{"start":{"line":44,"column":1},"filename":"/cases/each.else.pug","end":{"line":44,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/escape-chars.tokens.json b/packages/pug-parser/test/cases/escape-chars.tokens.json
index cba823a8f..902433352 100644
--- a/packages/pug-parser/test/cases/escape-chars.tokens.json
+++ b/packages/pug-parser/test/cases/escape-chars.tokens.json
@@ -1,6 +1,6 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"dot","line":1,"col":7}
-{"type":"start-pipeless-text","line":1,"col":8}
-{"type":"text","line":2,"col":3,"val":"var re = /\\d+/;"}
-{"type":"end-pipeless-text","line":2,"col":18}
-{"type":"eos","line":2,"col":18}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/escape-chars.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"dot","loc":{"start":{"line":1,"column":7},"filename":"/cases/escape-chars.pug","end":{"line":1,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":8},"filename":"/cases/escape-chars.pug","end":{"line":1,"column":8}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/escape-chars.pug","end":{"line":2,"column":18}},"val":"var re = /\\d+/;"}
+{"type":"end-pipeless-text","loc":{"start":{"line":2,"column":18},"filename":"/cases/escape-chars.pug","end":{"line":2,"column":18}}}
+{"type":"eos","loc":{"start":{"line":2,"column":18},"filename":"/cases/escape-chars.pug","end":{"line":2,"column":18}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/escape-test.tokens.json b/packages/pug-parser/test/cases/escape-test.tokens.json
index cf5dbb074..21e5824c8 100644
--- a/packages/pug-parser/test/cases/escape-test.tokens.json
+++ b/packages/pug-parser/test/cases/escape-test.tokens.json
@@ -1,20 +1,20 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"head"}
-{"type":"indent","line":4,"col":1,"val":8}
-{"type":"tag","line":4,"col":9,"val":"title"}
-{"type":"text","line":4,"col":15,"val":"escape-test"}
-{"type":"outdent","line":5,"col":5}
-{"type":"tag","line":5,"col":5,"val":"body"}
-{"type":"indent","line":6,"col":1,"val":8}
-{"type":"tag","line":6,"col":9,"val":"textarea"}
-{"type":"indent","line":7,"col":1,"val":12}
-{"type":"code","line":7,"col":13,"val":"var txt = '<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>'","mustEscape":false,"buffer":false}
-{"type":"newline","line":8,"col":1}
-{"type":"interpolated-code","line":8,"col":15,"val":"txt","mustEscape":true,"buffer":true}
-{"type":"outdent","line":9,"col":9}
-{"type":"outdent","line":9,"col":5}
-{"type":"outdent","line":9,"col":1}
-{"type":"eos","line":9,"col":1}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/escape-test.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/escape-test.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/escape-test.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/escape-test.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/escape-test.pug","end":{"line":3,"column":9}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/escape-test.pug","end":{"line":4,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":4,"column":9},"filename":"/cases/escape-test.pug","end":{"line":4,"column":14}},"val":"title"}
+{"type":"text","loc":{"start":{"line":4,"column":15},"filename":"/cases/escape-test.pug","end":{"line":4,"column":26}},"val":"escape-test"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/escape-test.pug","end":{"line":5,"column":5}}}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/escape-test.pug","end":{"line":5,"column":9}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/escape-test.pug","end":{"line":6,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":6,"column":9},"filename":"/cases/escape-test.pug","end":{"line":6,"column":17}},"val":"textarea"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/escape-test.pug","end":{"line":7,"column":13}},"val":12}
+{"type":"code","loc":{"start":{"line":7,"column":13},"filename":"/cases/escape-test.pug","end":{"line":7,"column":108}},"val":"var txt = '<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/escape-test.pug","end":{"line":8,"column":13}}}
+{"type":"interpolated-code","loc":{"start":{"line":8,"column":15},"filename":"/cases/escape-test.pug","end":{"line":8,"column":21}},"mustEscape":true,"buffer":true,"val":"txt"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
+{"type":"eos","loc":{"start":{"line":9,"column":1},"filename":"/cases/escape-test.pug","end":{"line":9,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json b/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json
index 1a99b13a9..f5818f306 100644
--- a/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json
+++ b/packages/pug-parser/test/cases/escaping-class-attribute.tokens.json
@@ -1,31 +1,31 @@
-{"type":"tag","line":1,"col":1,"val":"foo"}
-{"type":"start-attributes","line":1,"col":4}
-{"type":"attribute","line":1,"col":5,"name":"attr","val":"\"<%= bar %>\"","mustEscape":true}
-{"type":"end-attributes","line":1,"col":22}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"foo"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"class","val":"\"<%= bar %>\"","mustEscape":true}
-{"type":"end-attributes","line":2,"col":23}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"foo"}
-{"type":"start-attributes","line":3,"col":4}
-{"type":"attribute","line":3,"col":5,"name":"attr","val":"\"<%= bar %>\"","mustEscape":false}
-{"type":"end-attributes","line":3,"col":23}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"foo"}
-{"type":"start-attributes","line":4,"col":4}
-{"type":"attribute","line":4,"col":5,"name":"class","val":"\"<%= bar %>\"","mustEscape":false}
-{"type":"end-attributes","line":4,"col":24}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"foo"}
-{"type":"start-attributes","line":5,"col":4}
-{"type":"attribute","line":5,"col":5,"name":"class","val":"\"<%= bar %> lol rofl\"","mustEscape":false}
-{"type":"end-attributes","line":5,"col":33}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"foo"}
-{"type":"start-attributes","line":6,"col":4}
-{"type":"attribute","line":6,"col":5,"name":"class","val":"\"<%= bar %> lol rofl <%= lmao %>\"","mustEscape":false}
-{"type":"end-attributes","line":6,"col":45}
-{"type":"newline","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":22}},"name":"attr","mustEscape":true,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":22},"filename":"/cases/escaping-class-attribute.pug","end":{"line":1,"column":23}}}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":23}},"name":"class","mustEscape":true,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":23},"filename":"/cases/escaping-class-attribute.pug","end":{"line":2,"column":24}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":23}},"name":"attr","mustEscape":false,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":23},"filename":"/cases/escaping-class-attribute.pug","end":{"line":3,"column":24}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":24}},"name":"class","mustEscape":false,"val":"\"<%= bar %>\""}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":24},"filename":"/cases/escaping-class-attribute.pug","end":{"line":4,"column":25}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":33}},"name":"class","mustEscape":false,"val":"\"<%= bar %> lol rofl\""}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":33},"filename":"/cases/escaping-class-attribute.pug","end":{"line":5,"column":34}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":4},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":5},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":45}},"name":"class","mustEscape":false,"val":"\"<%= bar %> lol rofl <%= lmao %>\""}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":45},"filename":"/cases/escaping-class-attribute.pug","end":{"line":6,"column":46}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/escaping-class-attribute.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filter-in-include.tokens.json b/packages/pug-parser/test/cases/filter-in-include.tokens.json
index 4620c87ab..281073fcf 100644
--- a/packages/pug-parser/test/cases/filter-in-include.tokens.json
+++ b/packages/pug-parser/test/cases/filter-in-include.tokens.json
@@ -1,4 +1,4 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/filter-in-include.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/filter-in-include.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/filter-in-include.pug","end":{"line":1,"column":42}},"val":"./auxiliary/filter-in-include.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/filter-in-include.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/filter-in-include.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters-empty.tokens.json b/packages/pug-parser/test/cases/filters-empty.tokens.json
index 9ee079a93..2910b2a60 100644
--- a/packages/pug-parser/test/cases/filters-empty.tokens.json
+++ b/packages/pug-parser/test/cases/filters-empty.tokens.json
@@ -1,16 +1,16 @@
-{"type":"code","line":1,"col":1,"val":"var users = [{ name: 'tobi', age: 2 }]","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"fb:users"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"each","line":4,"col":3,"val":"user","key":null,"code":"users"}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"tag","line":5,"col":5,"val":"fb:user"}
-{"type":"start-attributes","line":5,"col":12}
-{"type":"attribute","line":5,"col":13,"name":"age","val":"user.age","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"indent","line":6,"col":1,"val":6}
-{"type":"filter","line":6,"col":7,"val":"cdata"}
-{"type":"outdent","line":7,"col":5}
-{"type":"outdent","line":7,"col":3}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":1,"column":41}},"val":"var users = [{ name: 'tobi', age: 2 }]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":3,"column":9}},"val":"fb:users"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"each","loc":{"start":{"line":4,"column":3},"filename":"/cases/filters-empty.pug","end":{"line":4,"column":20}},"val":"user","key":null,"code":"users"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":12}},"val":"fb:user"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":12},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":25}},"name":"age","mustEscape":true,"val":"user.age"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/filters-empty.pug","end":{"line":5,"column":26}}}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":6,"column":7}},"val":6}
+{"type":"filter","loc":{"start":{"line":6,"column":7},"filename":"/cases/filters-empty.pug","end":{"line":6,"column":13}},"val":"cdata"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters-empty.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.coffeescript.tokens.json b/packages/pug-parser/test/cases/filters.coffeescript.tokens.json
index c8449f5c2..95493914b 100644
--- a/packages/pug-parser/test/cases/filters.coffeescript.tokens.json
+++ b/packages/pug-parser/test/cases/filters.coffeescript.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"type","val":"'text/javascript'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"filter","line":2,"col":3,"val":"coffee-script"}
-{"type":"start-pipeless-text","line":2,"col":17}
-{"type":"text","line":3,"col":5,"val":"regexp = /\\n/"}
-{"type":"end-pipeless-text","line":3,"col":18}
-{"type":"newline","line":4,"col":1}
-{"type":"filter","line":4,"col":3,"val":"coffee-script"}
-{"type":"start-attributes","line":4,"col":17}
-{"type":"attribute","line":4,"col":18,"name":"minify","val":"true","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"start-pipeless-text","line":4,"col":30}
-{"type":"text","line":5,"col":5,"val":"math ="}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":5,"val":"  square: (value) -> value * value"}
-{"type":"end-pipeless-text","line":6,"col":39}
-{"type":"outdent","line":6,"col":39}
-{"type":"eos","line":6,"col":39}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":30}},"name":"type","mustEscape":true,"val":"'text/javascript'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/filters.coffeescript.pug","end":{"line":1,"column":31}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.coffeescript.pug","end":{"line":2,"column":17}},"val":"coffee-script"}
+{"type":"start-pipeless-text","loc":{"start":{"line":2,"column":17},"filename":"/cases/filters.coffeescript.pug","end":{"line":2,"column":17}}}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.coffeescript.pug","end":{"line":3,"column":18}},"val":"regexp = /\\n/"}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":18},"filename":"/cases/filters.coffeescript.pug","end":{"line":3,"column":18}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":3}}}
+{"type":"filter","loc":{"start":{"line":4,"column":3},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":17}},"val":"coffee-script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":17},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":18},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":29}},"name":"minify","mustEscape":true,"val":"true"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":30}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":4,"column":30},"filename":"/cases/filters.coffeescript.pug","end":{"line":4,"column":30}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters.coffeescript.pug","end":{"line":5,"column":11}},"val":"math ="}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":5}}}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}},"val":"  square: (value) -> value * value"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":39},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":39},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}}}
+{"type":"eos","loc":{"start":{"line":6,"column":39},"filename":"/cases/filters.coffeescript.pug","end":{"line":6,"column":39}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.custom.tokens.json b/packages/pug-parser/test/cases/filters.custom.tokens.json
index 785c11514..6117b2b88 100644
--- a/packages/pug-parser/test/cases/filters.custom.tokens.json
+++ b/packages/pug-parser/test/cases/filters.custom.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"filter","line":3,"col":5,"val":"custom"}
-{"type":"start-attributes","line":3,"col":12}
-{"type":"attribute","line":3,"col":13,"name":"opt","val":"'val'","mustEscape":true}
-{"type":"attribute","line":3,"col":23,"name":"num","val":"2","mustEscape":true}
-{"type":"end-attributes","line":3,"col":28}
-{"type":"start-pipeless-text","line":3,"col":29}
-{"type":"text","line":4,"col":7,"val":"Line 1"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":7,"val":"Line 2"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":7,"val":""}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":7,"val":"Line 4"}
-{"type":"end-pipeless-text","line":7,"col":13}
-{"type":"outdent","line":7,"col":13}
-{"type":"outdent","line":7,"col":13}
-{"type":"eos","line":7,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.custom.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"filter","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":12}},"val":"custom"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":12},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":22}},"name":"opt","mustEscape":true,"val":"'val'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":23},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":28}},"name":"num","mustEscape":true,"val":"2"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":28},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":29}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":29},"filename":"/cases/filters.custom.pug","end":{"line":3,"column":29}}}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.custom.pug","end":{"line":4,"column":13}},"val":"Line 1"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":5,"column":7}}}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/filters.custom.pug","end":{"line":5,"column":13}},"val":"Line 2"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":6,"column":1}}}
+{"type":"text","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":6,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":7}}}
+{"type":"text","loc":{"start":{"line":7,"column":7},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}},"val":"Line 4"}
+{"type":"end-pipeless-text","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
+{"type":"eos","loc":{"start":{"line":7,"column":13},"filename":"/cases/filters.custom.pug","end":{"line":7,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.include.custom.tokens.json b/packages/pug-parser/test/cases/filters.include.custom.tokens.json
index 63778a17d..f2a91e187 100644
--- a/packages/pug-parser/test/cases/filters.include.custom.tokens.json
+++ b/packages/pug-parser/test/cases/filters.include.custom.tokens.json
@@ -1,17 +1,17 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"pre"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"include","line":4,"col":7}
-{"type":"filter","line":4,"col":14,"val":"custom"}
-{"type":"start-attributes","line":4,"col":21}
-{"type":"attribute","line":4,"col":22,"name":"opt","val":"'val'","mustEscape":true}
-{"type":"attribute","line":4,"col":32,"name":"num","val":"2","mustEscape":true}
-{"type":"end-attributes","line":4,"col":37}
-{"type":"path","line":4,"col":39,"val":"filters.include.custom.pug"}
-{"type":"outdent","line":5,"col":5}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.include.custom.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.include.custom.pug","end":{"line":3,"column":8}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":14}}}
+{"type":"filter","loc":{"start":{"line":4,"column":14},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":21}},"val":"custom"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":21},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":22},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":31}},"name":"opt","mustEscape":true,"val":"'val'"}
+{"type":"attribute","loc":{"start":{"line":4,"column":32},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":37}},"name":"num","mustEscape":true,"val":"2"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":37},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":38}}}
+{"type":"path","loc":{"start":{"line":4,"column":39},"filename":"/cases/filters.include.custom.pug","end":{"line":4,"column":65}},"val":"filters.include.custom.pug"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.custom.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.include.tokens.json b/packages/pug-parser/test/cases/filters.include.tokens.json
index a2c1ac153..4ae9daea4 100644
--- a/packages/pug-parser/test/cases/filters.include.tokens.json
+++ b/packages/pug-parser/test/cases/filters.include.tokens.json
@@ -1,30 +1,30 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"filter","line":3,"col":12,"val":"markdown-it"}
-{"type":"path","line":3,"col":25,"val":"some.md"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"script"}
-{"type":"indent","line":5,"col":1,"val":6}
-{"type":"include","line":5,"col":7}
-{"type":"filter","line":5,"col":14,"val":"coffee-script"}
-{"type":"start-attributes","line":5,"col":28}
-{"type":"attribute","line":5,"col":29,"name":"minify","val":"true","mustEscape":true}
-{"type":"end-attributes","line":5,"col":40}
-{"type":"path","line":5,"col":42,"val":"include-filter-coffee.coffee"}
-{"type":"outdent","line":6,"col":5}
-{"type":"tag","line":6,"col":5,"val":"script"}
-{"type":"indent","line":7,"col":1,"val":6}
-{"type":"include","line":7,"col":7}
-{"type":"filter","line":7,"col":14,"val":"cdata"}
-{"type":"filter","line":7,"col":20,"val":"coffee-script"}
-{"type":"start-attributes","line":7,"col":34}
-{"type":"attribute","line":7,"col":35,"name":"minify","val":"false","mustEscape":true}
-{"type":"end-attributes","line":7,"col":47}
-{"type":"path","line":7,"col":49,"val":"include-filter-coffee.coffee"}
-{"type":"outdent","line":8,"col":5}
-{"type":"outdent","line":8,"col":3}
-{"type":"outdent","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.include.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.include.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.include.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.include.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.include.pug","end":{"line":3,"column":12}}}
+{"type":"filter","loc":{"start":{"line":3,"column":12},"filename":"/cases/filters.include.pug","end":{"line":3,"column":24}},"val":"markdown-it"}
+{"type":"path","loc":{"start":{"line":3,"column":25},"filename":"/cases/filters.include.pug","end":{"line":3,"column":32}},"val":"some.md"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.include.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/filters.include.pug","end":{"line":4,"column":11}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.include.pug","end":{"line":5,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":5,"column":7},"filename":"/cases/filters.include.pug","end":{"line":5,"column":14}}}
+{"type":"filter","loc":{"start":{"line":5,"column":14},"filename":"/cases/filters.include.pug","end":{"line":5,"column":28}},"val":"coffee-script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":28},"filename":"/cases/filters.include.pug","end":{"line":5,"column":29}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":29},"filename":"/cases/filters.include.pug","end":{"line":5,"column":40}},"name":"minify","mustEscape":true,"val":"true"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":40},"filename":"/cases/filters.include.pug","end":{"line":5,"column":41}}}
+{"type":"path","loc":{"start":{"line":5,"column":42},"filename":"/cases/filters.include.pug","end":{"line":5,"column":70}},"val":"include-filter-coffee.coffee"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.include.pug","end":{"line":6,"column":5}}}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/filters.include.pug","end":{"line":6,"column":11}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.include.pug","end":{"line":7,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":7,"column":7},"filename":"/cases/filters.include.pug","end":{"line":7,"column":14}}}
+{"type":"filter","loc":{"start":{"line":7,"column":14},"filename":"/cases/filters.include.pug","end":{"line":7,"column":20}},"val":"cdata"}
+{"type":"filter","loc":{"start":{"line":7,"column":20},"filename":"/cases/filters.include.pug","end":{"line":7,"column":34}},"val":"coffee-script"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":34},"filename":"/cases/filters.include.pug","end":{"line":7,"column":35}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":35},"filename":"/cases/filters.include.pug","end":{"line":7,"column":47}},"name":"minify","mustEscape":true,"val":"false"}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":47},"filename":"/cases/filters.include.pug","end":{"line":7,"column":48}}}
+{"type":"path","loc":{"start":{"line":7,"column":49},"filename":"/cases/filters.include.pug","end":{"line":7,"column":77}},"val":"include-filter-coffee.coffee"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.include.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.inline.tokens.json b/packages/pug-parser/test/cases/filters.inline.tokens.json
index 556e1bf47..f0a3dcbcb 100644
--- a/packages/pug-parser/test/cases/filters.inline.tokens.json
+++ b/packages/pug-parser/test/cases/filters.inline.tokens.json
@@ -1,8 +1,8 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"before "}
-{"type":"start-pug-interpolation","line":1,"col":10}
-{"type":"filter","line":1,"col":12,"val":"cdata"}
-{"type":"text","line":1,"col":19,"val":"inside"}
-{"type":"end-pug-interpolation","line":1,"col":25}
-{"type":"text","line":1,"col":26,"val":" after"}
-{"type":"eos","line":1,"col":32}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":10}},"val":"before "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":1,"column":10},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":12}}}
+{"type":"filter","loc":{"start":{"line":1,"column":12},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":18}},"val":"cdata"}
+{"type":"text","loc":{"start":{"line":1,"column":19},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":25}},"val":"inside"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":1,"column":25},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":26}}}
+{"type":"text","loc":{"start":{"line":1,"column":26},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":32}},"val":" after"}
+{"type":"eos","loc":{"start":{"line":1,"column":32},"filename":"/cases/filters.inline.pug","end":{"line":1,"column":32}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.less.tokens.json b/packages/pug-parser/test/cases/filters.less.tokens.json
index 7b83b51f6..1e04ad19f 100644
--- a/packages/pug-parser/test/cases/filters.less.tokens.json
+++ b/packages/pug-parser/test/cases/filters.less.tokens.json
@@ -1,23 +1,23 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"style"}
-{"type":"start-attributes","line":3,"col":10}
-{"type":"attribute","line":3,"col":11,"name":"type","val":"\"text/css\"","mustEscape":true}
-{"type":"end-attributes","line":3,"col":26}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"filter","line":4,"col":7,"val":"less"}
-{"type":"start-pipeless-text","line":4,"col":12}
-{"type":"text","line":5,"col":9,"val":"@pad: 15px;"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":9,"val":"body {"}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":9,"val":"  padding: @pad;"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":9,"val":"}"}
-{"type":"end-pipeless-text","line":8,"col":10}
-{"type":"outdent","line":8,"col":10}
-{"type":"outdent","line":8,"col":10}
-{"type":"outdent","line":8,"col":10}
-{"type":"eos","line":8,"col":10}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.less.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.less.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.less.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.less.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.less.pug","end":{"line":3,"column":10}},"val":"style"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":10},"filename":"/cases/filters.less.pug","end":{"line":3,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":11},"filename":"/cases/filters.less.pug","end":{"line":3,"column":26}},"name":"type","mustEscape":true,"val":"\"text/css\""}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":26},"filename":"/cases/filters.less.pug","end":{"line":3,"column":27}}}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.less.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"filter","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.less.pug","end":{"line":4,"column":12}},"val":"less"}
+{"type":"start-pipeless-text","loc":{"start":{"line":4,"column":12},"filename":"/cases/filters.less.pug","end":{"line":4,"column":12}}}
+{"type":"text","loc":{"start":{"line":5,"column":9},"filename":"/cases/filters.less.pug","end":{"line":5,"column":20}},"val":"@pad: 15px;"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.less.pug","end":{"line":6,"column":9}}}
+{"type":"text","loc":{"start":{"line":6,"column":9},"filename":"/cases/filters.less.pug","end":{"line":6,"column":15}},"val":"body {"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.less.pug","end":{"line":7,"column":9}}}
+{"type":"text","loc":{"start":{"line":7,"column":9},"filename":"/cases/filters.less.pug","end":{"line":7,"column":25}},"val":"  padding: @pad;"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.less.pug","end":{"line":8,"column":9}}}
+{"type":"text","loc":{"start":{"line":8,"column":9},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
+{"type":"eos","loc":{"start":{"line":8,"column":10},"filename":"/cases/filters.less.pug","end":{"line":8,"column":10}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.markdown.tokens.json b/packages/pug-parser/test/cases/filters.markdown.tokens.json
index 96fd94d91..64323a305 100644
--- a/packages/pug-parser/test/cases/filters.markdown.tokens.json
+++ b/packages/pug-parser/test/cases/filters.markdown.tokens.json
@@ -1,13 +1,13 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"filter","line":3,"col":5,"val":"markdown-it"}
-{"type":"start-pipeless-text","line":3,"col":17}
-{"type":"text","line":4,"col":7,"val":"This is _some_ awesome **markdown**"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":7,"val":"whoop."}
-{"type":"end-pipeless-text","line":5,"col":13}
-{"type":"outdent","line":5,"col":13}
-{"type":"outdent","line":5,"col":13}
-{"type":"eos","line":5,"col":13}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.markdown.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"filter","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.markdown.pug","end":{"line":3,"column":17}},"val":"markdown-it"}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":17},"filename":"/cases/filters.markdown.pug","end":{"line":3,"column":17}}}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.markdown.pug","end":{"line":4,"column":42}},"val":"This is _some_ awesome **markdown**"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":7}}}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}},"val":"whoop."}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
+{"type":"eos","loc":{"start":{"line":5,"column":13},"filename":"/cases/filters.markdown.pug","end":{"line":5,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.nested.tokens.json b/packages/pug-parser/test/cases/filters.nested.tokens.json
index d59cbfa2a..7d8856c9a 100644
--- a/packages/pug-parser/test/cases/filters.nested.tokens.json
+++ b/packages/pug-parser/test/cases/filters.nested.tokens.json
@@ -1,26 +1,26 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"filter","line":2,"col":3,"val":"cdata"}
-{"type":"filter","line":2,"col":9,"val":"uglify-js"}
-{"type":"start-pipeless-text","line":2,"col":19}
-{"type":"text","line":3,"col":5,"val":"(function() {"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":5,"val":"  console.log('test')"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":5,"val":"})()"}
-{"type":"end-pipeless-text","line":5,"col":9}
-{"type":"outdent","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"filter","line":7,"col":3,"val":"cdata"}
-{"type":"filter","line":7,"col":9,"val":"uglify-js"}
-{"type":"filter","line":7,"col":19,"val":"coffee-script"}
-{"type":"start-pipeless-text","line":7,"col":33}
-{"type":"text","line":8,"col":5,"val":"(->"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":"  console.log 'test'"}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":")()"}
-{"type":"end-pipeless-text","line":10,"col":8}
-{"type":"outdent","line":10,"col":8}
-{"type":"eos","line":10,"col":8}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":9}},"val":"cdata"}
+{"type":"filter","loc":{"start":{"line":2,"column":9},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":19}},"val":"uglify-js"}
+{"type":"start-pipeless-text","loc":{"start":{"line":2,"column":19},"filename":"/cases/filters.nested.pug","end":{"line":2,"column":19}}}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":3,"column":18}},"val":"(function() {"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":4,"column":5}}}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":4,"column":26}},"val":"  console.log('test')"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":5,"column":5}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":5,"column":9}},"val":"})()"}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":9},"filename":"/cases/filters.nested.pug","end":{"line":5,"column":9}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":7,"column":3},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":9}},"val":"cdata"}
+{"type":"filter","loc":{"start":{"line":7,"column":9},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":19}},"val":"uglify-js"}
+{"type":"filter","loc":{"start":{"line":7,"column":19},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":33}},"val":"coffee-script"}
+{"type":"start-pipeless-text","loc":{"start":{"line":7,"column":33},"filename":"/cases/filters.nested.pug","end":{"line":7,"column":33}}}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":8,"column":8}},"val":"(->"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":9,"column":5}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":9,"column":25}},"val":"  console.log 'test'"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":5}}}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}},"val":")()"}
+{"type":"end-pipeless-text","loc":{"start":{"line":10,"column":8},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":8},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}}}
+{"type":"eos","loc":{"start":{"line":10,"column":8},"filename":"/cases/filters.nested.pug","end":{"line":10,"column":8}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.stylus.tokens.json b/packages/pug-parser/test/cases/filters.stylus.tokens.json
index e8fd8b56d..d23ec5b68 100644
--- a/packages/pug-parser/test/cases/filters.stylus.tokens.json
+++ b/packages/pug-parser/test/cases/filters.stylus.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"style"}
-{"type":"start-attributes","line":3,"col":10}
-{"type":"attribute","line":3,"col":11,"name":"type","val":"\"text/css\"","mustEscape":true}
-{"type":"end-attributes","line":3,"col":26}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"filter","line":4,"col":7,"val":"stylus"}
-{"type":"start-pipeless-text","line":4,"col":14}
-{"type":"text","line":5,"col":9,"val":"body"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":9,"val":"  padding: 50px"}
-{"type":"end-pipeless-text","line":6,"col":24}
-{"type":"outdent","line":7,"col":5}
-{"type":"outdent","line":7,"col":3}
-{"type":"tag","line":7,"col":3,"val":"body"}
-{"type":"outdent","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/filters.stylus.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":10}},"val":"style"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":10},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":11},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":26}},"name":"type","mustEscape":true,"val":"\"text/css\""}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":26},"filename":"/cases/filters.stylus.pug","end":{"line":3,"column":27}}}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"filter","loc":{"start":{"line":4,"column":7},"filename":"/cases/filters.stylus.pug","end":{"line":4,"column":14}},"val":"stylus"}
+{"type":"start-pipeless-text","loc":{"start":{"line":4,"column":14},"filename":"/cases/filters.stylus.pug","end":{"line":4,"column":14}}}
+{"type":"text","loc":{"start":{"line":5,"column":9},"filename":"/cases/filters.stylus.pug","end":{"line":5,"column":13}},"val":"body"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":6,"column":9}}}
+{"type":"text","loc":{"start":{"line":6,"column":9},"filename":"/cases/filters.stylus.pug","end":{"line":6,"column":24}},"val":"  padding: 50px"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":24},"filename":"/cases/filters.stylus.pug","end":{"line":6,"column":24}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":7,"column":3}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/filters.stylus.pug","end":{"line":7,"column":7}},"val":"body"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/filters.stylus.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/filters.verbatim.tokens.json b/packages/pug-parser/test/cases/filters.verbatim.tokens.json
new file mode 100644
index 000000000..21a79d340
--- /dev/null
+++ b/packages/pug-parser/test/cases/filters.verbatim.tokens.json
@@ -0,0 +1,13 @@
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":2,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":2,"column":2},"filename":"/cases/filters.verbatim.pug","end":{"line":2,"column":5}},"val":"div"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"filter","loc":{"start":{"line":3,"column":3},"filename":"/cases/filters.verbatim.pug","end":{"line":3,"column":12}},"val":"verbatim"}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":12},"filename":"/cases/filters.verbatim.pug","end":{"line":3,"column":12}}}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/filters.verbatim.pug","end":{"line":4,"column":40}},"val":"filters are applied at compile time"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":5}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}},"val":"with no #[b interpolation] at #{all}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
+{"type":"eos","loc":{"start":{"line":5,"column":41},"filename":"/cases/filters.verbatim.pug","end":{"line":5,"column":41}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/html.tokens.json b/packages/pug-parser/test/cases/html.tokens.json
index 9b2e5be11..77f475336 100644
--- a/packages/pug-parser/test/cases/html.tokens.json
+++ b/packages/pug-parser/test/cases/html.tokens.json
@@ -1,26 +1,26 @@
-{"type":"code","line":1,"col":1,"val":"var version = 1449104952939","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"text-html","line":3,"col":1,"val":"<ul>"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"text-html","line":4,"col":3,"val":"<li>foo</li>"}
-{"type":"newline","line":5,"col":1}
-{"type":"text-html","line":5,"col":3,"val":"<li>bar</li>"}
-{"type":"newline","line":6,"col":1}
-{"type":"text-html","line":6,"col":3,"val":"<li>baz</li>"}
-{"type":"outdent","line":7,"col":1}
-{"type":"text-html","line":7,"col":1,"val":"</ul>"}
-{"type":"newline","line":9,"col":1}
-{"type":"text-html","line":9,"col":1,"val":"<!--build:js /js/app.min.js?v="}
-{"type":"interpolated-code","line":9,"col":31,"mustEscape":true,"buffer":true,"val":"version"}
-{"type":"text-html","line":9,"col":41,"val":"-->"}
-{"type":"newline","line":10,"col":1}
-{"type":"text-html","line":10,"col":1,"val":"<!--endbuild-->"}
-{"type":"newline","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"p"}
-{"type":"text","line":12,"col":3,"val":"You can <em>embed</em> html as well."}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":1,"val":"p"}
-{"type":":","line":13,"col":2}
-{"type":"text-html","line":13,"col":4,"val":"<strong>Even</strong> as the body of a block expansion."}
-{"type":"newline","line":14,"col":1}
-{"type":"eos","line":14,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/html.pug","end":{"line":1,"column":30}},"val":"var version = 1449104952939","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/html.pug","end":{"line":3,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":3,"column":1},"filename":"/cases/html.pug","end":{"line":3,"column":5}},"val":"<ul>"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/html.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"text-html","loc":{"start":{"line":4,"column":3},"filename":"/cases/html.pug","end":{"line":4,"column":15}},"val":"<li>foo</li>"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/html.pug","end":{"line":5,"column":3}}}
+{"type":"text-html","loc":{"start":{"line":5,"column":3},"filename":"/cases/html.pug","end":{"line":5,"column":15}},"val":"<li>bar</li>"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/html.pug","end":{"line":6,"column":3}}}
+{"type":"text-html","loc":{"start":{"line":6,"column":3},"filename":"/cases/html.pug","end":{"line":6,"column":15}},"val":"<li>baz</li>"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/html.pug","end":{"line":7,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":7,"column":1},"filename":"/cases/html.pug","end":{"line":7,"column":6}},"val":"</ul>"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/html.pug","end":{"line":9,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":9,"column":1},"filename":"/cases/html.pug","end":{"line":9,"column":31}},"val":"<!--build:js /js/app.min.js?v="}
+{"type":"interpolated-code","loc":{"start":{"line":9,"column":31},"filename":"/cases/html.pug","end":{"line":9,"column":41}},"mustEscape":true,"buffer":true,"val":"version"}
+{"type":"text-html","loc":{"start":{"line":9,"column":41},"filename":"/cases/html.pug","end":{"line":9,"column":44}},"val":"-->"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/html.pug","end":{"line":10,"column":1}}}
+{"type":"text-html","loc":{"start":{"line":10,"column":1},"filename":"/cases/html.pug","end":{"line":10,"column":16}},"val":"<!--endbuild-->"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/html.pug","end":{"line":12,"column":1}}}
+{"type":"tag","loc":{"start":{"line":12,"column":1},"filename":"/cases/html.pug","end":{"line":12,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":12,"column":3},"filename":"/cases/html.pug","end":{"line":12,"column":39}},"val":"You can <em>embed</em> html as well."}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/html.pug","end":{"line":13,"column":1}}}
+{"type":"tag","loc":{"start":{"line":13,"column":1},"filename":"/cases/html.pug","end":{"line":13,"column":2}},"val":"p"}
+{"type":":","loc":{"start":{"line":13,"column":2},"filename":"/cases/html.pug","end":{"line":13,"column":4}}}
+{"type":"text-html","loc":{"start":{"line":13,"column":4},"filename":"/cases/html.pug","end":{"line":13,"column":59}},"val":"<strong>Even</strong> as the body of a block expansion."}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/html.pug","end":{"line":14,"column":1}}}
+{"type":"eos","loc":{"start":{"line":14,"column":1},"filename":"/cases/html.pug","end":{"line":14,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/html5.tokens.json b/packages/pug-parser/test/cases/html5.tokens.json
index 2368d7acb..8103566d3 100644
--- a/packages/pug-parser/test/cases/html5.tokens.json
+++ b/packages/pug-parser/test/cases/html5.tokens.json
@@ -1,20 +1,20 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"input"}
-{"type":"start-attributes","line":2,"col":6}
-{"type":"attribute","line":2,"col":7,"name":"type","val":"'checkbox'","mustEscape":true}
-{"type":"attribute","line":2,"col":24,"name":"checked","val":true,"mustEscape":false}
-{"type":"end-attributes","line":2,"col":31}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"input"}
-{"type":"start-attributes","line":3,"col":6}
-{"type":"attribute","line":3,"col":7,"name":"type","val":"'checkbox'","mustEscape":true}
-{"type":"attribute","line":3,"col":24,"name":"checked","val":"true","mustEscape":true}
-{"type":"end-attributes","line":3,"col":36}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"input"}
-{"type":"start-attributes","line":4,"col":6}
-{"type":"attribute","line":4,"col":7,"name":"type","val":"'checkbox'","mustEscape":true}
-{"type":"attribute","line":4,"col":24,"name":"checked","val":"false","mustEscape":true}
-{"type":"end-attributes","line":4,"col":37}
-{"type":"eos","line":4,"col":38}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/html5.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/html5.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/html5.pug","end":{"line":2,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":6},"filename":"/cases/html5.pug","end":{"line":2,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":7},"filename":"/cases/html5.pug","end":{"line":2,"column":22}},"name":"type","mustEscape":true,"val":"'checkbox'"}
+{"type":"attribute","loc":{"start":{"line":2,"column":24},"filename":"/cases/html5.pug","end":{"line":2,"column":31}},"name":"checked","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":31},"filename":"/cases/html5.pug","end":{"line":2,"column":32}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/html5.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/html5.pug","end":{"line":3,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":6},"filename":"/cases/html5.pug","end":{"line":3,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":7},"filename":"/cases/html5.pug","end":{"line":3,"column":22}},"name":"type","mustEscape":true,"val":"'checkbox'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":24},"filename":"/cases/html5.pug","end":{"line":3,"column":36}},"name":"checked","mustEscape":true,"val":"true"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":36},"filename":"/cases/html5.pug","end":{"line":3,"column":37}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/html5.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/html5.pug","end":{"line":4,"column":6}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":6},"filename":"/cases/html5.pug","end":{"line":4,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":7},"filename":"/cases/html5.pug","end":{"line":4,"column":22}},"name":"type","mustEscape":true,"val":"'checkbox'"}
+{"type":"attribute","loc":{"start":{"line":4,"column":24},"filename":"/cases/html5.pug","end":{"line":4,"column":37}},"name":"checked","mustEscape":true,"val":"false"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":37},"filename":"/cases/html5.pug","end":{"line":4,"column":38}}}
+{"type":"eos","loc":{"start":{"line":4,"column":38},"filename":"/cases/html5.pug","end":{"line":4,"column":38}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-extends-from-root.tokens.json b/packages/pug-parser/test/cases/include-extends-from-root.tokens.json
index 00b63d9a7..0cf1b16fe 100644
--- a/packages/pug-parser/test/cases/include-extends-from-root.tokens.json
+++ b/packages/pug-parser/test/cases/include-extends-from-root.tokens.json
@@ -1,4 +1,4 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"/auxiliary/extends-from-root.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-extends-from-root.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/include-extends-from-root.pug","end":{"line":1,"column":41}},"val":"/auxiliary/extends-from-root.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-from-root.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-from-root.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json b/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json
index a1c6608e1..fd4ffd122 100644
--- a/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json
+++ b/packages/pug-parser/test/cases/include-extends-of-common-template.tokens.json
@@ -1,7 +1,7 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"auxiliary/extends-empty-block-1.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"include","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/extends-empty-block-2.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"eos","line":3,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":1,"column":44}},"val":"auxiliary/extends-empty-block-1.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":2,"column":1}}}
+{"type":"include","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":2,"column":44}},"val":"auxiliary/extends-empty-block-2.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":3,"column":1}}}
+{"type":"eos","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-extends-of-common-template.pug","end":{"line":3,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-extends-relative.tokens.json b/packages/pug-parser/test/cases/include-extends-relative.tokens.json
index 277513530..ee58db1da 100644
--- a/packages/pug-parser/test/cases/include-extends-relative.tokens.json
+++ b/packages/pug-parser/test/cases/include-extends-relative.tokens.json
@@ -1,4 +1,4 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"../cases/auxiliary/extends-relative.pug"}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-extends-relative.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/include-extends-relative.pug","end":{"line":1,"column":48}},"val":"../cases/auxiliary/extends-relative.pug"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-relative.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-extends-relative.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-only-text-body.tokens.json b/packages/pug-parser/test/cases/include-only-text-body.tokens.json
index 87071afbe..6dcf02f1a 100644
--- a/packages/pug-parser/test/cases/include-only-text-body.tokens.json
+++ b/packages/pug-parser/test/cases/include-only-text-body.tokens.json
@@ -1,7 +1,7 @@
-{"type":"text","line":1,"col":3,"val":"The message is \""}
-{"type":"newline","line":2,"col":1}
-{"type":"yield","line":2,"col":1}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"\""}
-{"type":"newline","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/include-only-text-body.pug","end":{"line":1,"column":19}},"val":"The message is \""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":2,"column":1}}}
+{"type":"yield","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":2,"column":6}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":3,"column":1}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/include-only-text-body.pug","end":{"line":3,"column":4}},"val":"\""}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-only-text-body.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-only-text.tokens.json b/packages/pug-parser/test/cases/include-only-text.tokens.json
index de01296ba..8e30ac138 100644
--- a/packages/pug-parser/test/cases/include-only-text.tokens.json
+++ b/packages/pug-parser/test/cases/include-only-text.tokens.json
@@ -1,16 +1,16 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"p"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"include","line":4,"col":7}
-{"type":"path","line":4,"col":15,"val":"include-only-text-body.pug"}
-{"type":"indent","line":5,"col":1,"val":8}
-{"type":"tag","line":5,"col":9,"val":"em"}
-{"type":"text","line":5,"col":12,"val":"hello world"}
-{"type":"outdent","line":6,"col":7}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/include-only-text.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/include-only-text.pug","end":{"line":3,"column":6}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"include","loc":{"start":{"line":4,"column":7},"filename":"/cases/include-only-text.pug","end":{"line":4,"column":14}}}
+{"type":"path","loc":{"start":{"line":4,"column":15},"filename":"/cases/include-only-text.pug","end":{"line":4,"column":41}},"val":"include-only-text-body.pug"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":5,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":5,"column":9},"filename":"/cases/include-only-text.pug","end":{"line":5,"column":11}},"val":"em"}
+{"type":"text","loc":{"start":{"line":5,"column":12},"filename":"/cases/include-only-text.pug","end":{"line":5,"column":23}},"val":"hello world"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/include-only-text.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-with-text-head.tokens.json b/packages/pug-parser/test/cases/include-with-text-head.tokens.json
index 885812525..a469b42e4 100644
--- a/packages/pug-parser/test/cases/include-with-text-head.tokens.json
+++ b/packages/pug-parser/test/cases/include-with-text-head.tokens.json
@@ -1,12 +1,12 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"script"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"type","val":"'text/javascript'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":32}
-{"type":"dot","line":2,"col":33}
-{"type":"start-pipeless-text","line":2,"col":34}
-{"type":"text","line":3,"col":5,"val":"alert('hello world');"}
-{"type":"end-pipeless-text","line":3,"col":26}
-{"type":"outdent","line":3,"col":26}
-{"type":"eos","line":3,"col":26}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-with-text-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":32}},"name":"type","mustEscape":true,"val":"'text/javascript'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":32},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":33}}}
+{"type":"dot","loc":{"start":{"line":2,"column":33},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":34}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":2,"column":34},"filename":"/cases/include-with-text-head.pug","end":{"line":2,"column":34}}}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}},"val":"alert('hello world');"}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":26},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":3,"column":26},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}}}
+{"type":"eos","loc":{"start":{"line":3,"column":26},"filename":"/cases/include-with-text-head.pug","end":{"line":3,"column":26}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include-with-text.tokens.json b/packages/pug-parser/test/cases/include-with-text.tokens.json
index e2ee8a323..ed94f631e 100644
--- a/packages/pug-parser/test/cases/include-with-text.tokens.json
+++ b/packages/pug-parser/test/cases/include-with-text.tokens.json
@@ -1,17 +1,17 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"include","line":2,"col":3}
-{"type":"path","line":2,"col":11,"val":"include-with-text-head.pug"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"script"}
-{"type":"start-attributes","line":3,"col":11}
-{"type":"attribute","line":3,"col":12,"name":"src","val":"'/caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":29}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"script"}
-{"type":"start-attributes","line":4,"col":11}
-{"type":"attribute","line":4,"col":12,"name":"src","val":"'/app.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":25}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":2,"column":3},"filename":"/cases/include-with-text.pug","end":{"line":2,"column":10}}}
+{"type":"path","loc":{"start":{"line":2,"column":11},"filename":"/cases/include-with-text.pug","end":{"line":2,"column":37}},"val":"include-with-text-head.pug"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":11}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":11},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":12},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":29}},"name":"src","mustEscape":true,"val":"'/caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":29},"filename":"/cases/include-with-text.pug","end":{"line":3,"column":30}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":11}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":11},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":12},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":25}},"name":"src","mustEscape":true,"val":"'/app.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":25},"filename":"/cases/include-with-text.pug","end":{"line":4,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/include-with-text.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include.script.tokens.json b/packages/pug-parser/test/cases/include.script.tokens.json
index b41e8f076..967373acc 100644
--- a/packages/pug-parser/test/cases/include.script.tokens.json
+++ b/packages/pug-parser/test/cases/include.script.tokens.json
@@ -1,10 +1,10 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"id","line":1,"col":7,"val":"pet-template"}
-{"type":"start-attributes","line":1,"col":20}
-{"type":"attribute","line":1,"col":21,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":43}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"include","line":2,"col":3}
-{"type":"path","line":2,"col":11,"val":"auxiliary/pet.pug"}
-{"type":"outdent","line":3,"col":1}
-{"type":"eos","line":3,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/include.script.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"id","loc":{"start":{"line":1,"column":7},"filename":"/cases/include.script.pug","end":{"line":1,"column":20}},"val":"pet-template"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":20},"filename":"/cases/include.script.pug","end":{"line":1,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":21},"filename":"/cases/include.script.pug","end":{"line":1,"column":43}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":43},"filename":"/cases/include.script.pug","end":{"line":1,"column":44}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/include.script.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":2,"column":3},"filename":"/cases/include.script.pug","end":{"line":2,"column":10}}}
+{"type":"path","loc":{"start":{"line":2,"column":11},"filename":"/cases/include.script.pug","end":{"line":2,"column":28}},"val":"auxiliary/pet.pug"}
+{"type":"outdent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include.script.pug","end":{"line":3,"column":1}}}
+{"type":"eos","loc":{"start":{"line":3,"column":1},"filename":"/cases/include.script.pug","end":{"line":3,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/include.yield.nested.tokens.json b/packages/pug-parser/test/cases/include.yield.nested.tokens.json
index 5ffe4f0cf..6bf6a8afd 100644
--- a/packages/pug-parser/test/cases/include.yield.nested.tokens.json
+++ b/packages/pug-parser/test/cases/include.yield.nested.tokens.json
@@ -1,11 +1,11 @@
-{"type":"newline","line":2,"col":1}
-{"type":"include","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/yield-nested.pug"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"p"}
-{"type":"text","line":3,"col":5,"val":"some content"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"text","line":4,"col":5,"val":"and some more"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":2,"column":1}}}
+{"type":"include","loc":{"start":{"line":2,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/include.yield.nested.pug","end":{"line":2,"column":35}},"val":"auxiliary/yield-nested.pug"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/include.yield.nested.pug","end":{"line":3,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/include.yield.nested.pug","end":{"line":3,"column":17}},"val":"some content"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/include.yield.nested.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/include.yield.nested.pug","end":{"line":4,"column":18}},"val":"and some more"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/include.yield.nested.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json b/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json
index 9cb6d5faf..040135fbf 100644
--- a/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json
+++ b/packages/pug-parser/test/cases/includes-with-ext-js.tokens.json
@@ -1,9 +1,9 @@
-{"type":"tag","line":1,"col":1,"val":"pre"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"code"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"javascript-new-lines.js"}
-{"type":"outdent","line":4,"col":3}
-{"type":"outdent","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":1,"column":4}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/includes-with-ext-js.pug","end":{"line":2,"column":7}},"val":"code"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/includes-with-ext-js.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/includes-with-ext-js.pug","end":{"line":3,"column":36}},"val":"javascript-new-lines.js"}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":4,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes-with-ext-js.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/includes.tokens.json b/packages/pug-parser/test/cases/includes.tokens.json
index 19592587b..c8a064f17 100644
--- a/packages/pug-parser/test/cases/includes.tokens.json
+++ b/packages/pug-parser/test/cases/includes.tokens.json
@@ -1,25 +1,25 @@
-{"type":"newline","line":2,"col":1}
-{"type":"include","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/mixins.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"call","line":4,"col":1,"val":"foo","args":null}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"body"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"include","line":7,"col":3}
-{"type":"path","line":7,"col":11,"val":"auxiliary/smile.html"}
-{"type":"newline","line":8,"col":1}
-{"type":"include","line":8,"col":3}
-{"type":"path","line":8,"col":11,"val":"auxiliary/escapes.html"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"script"}
-{"type":"start-attributes","line":9,"col":9}
-{"type":"attribute","line":9,"col":10,"name":"type","val":"\"text/javascript\"","mustEscape":true}
-{"type":"end-attributes","line":9,"col":32}
-{"type":"indent","line":10,"col":1,"val":4}
-{"type":"include","line":10,"col":5}
-{"type":"filter","line":10,"col":12,"val":"verbatim"}
-{"type":"path","line":10,"col":22,"val":"auxiliary/includable.js"}
-{"type":"outdent","line":11,"col":3}
-{"type":"outdent","line":11,"col":1}
-{"type":"eos","line":11,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/includes.pug","end":{"line":2,"column":1}}}
+{"type":"include","loc":{"start":{"line":2,"column":1},"filename":"/cases/includes.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/includes.pug","end":{"line":2,"column":29}},"val":"auxiliary/mixins.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes.pug","end":{"line":4,"column":1}}}
+{"type":"call","loc":{"start":{"line":4,"column":1},"filename":"/cases/includes.pug","end":{"line":4,"column":5}},"val":"foo","args":null}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/includes.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/includes.pug","end":{"line":6,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/includes.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":7,"column":3},"filename":"/cases/includes.pug","end":{"line":7,"column":10}}}
+{"type":"path","loc":{"start":{"line":7,"column":11},"filename":"/cases/includes.pug","end":{"line":7,"column":31}},"val":"auxiliary/smile.html"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/includes.pug","end":{"line":8,"column":3}}}
+{"type":"include","loc":{"start":{"line":8,"column":3},"filename":"/cases/includes.pug","end":{"line":8,"column":10}}}
+{"type":"path","loc":{"start":{"line":8,"column":11},"filename":"/cases/includes.pug","end":{"line":8,"column":33}},"val":"auxiliary/escapes.html"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/includes.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/includes.pug","end":{"line":9,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":9},"filename":"/cases/includes.pug","end":{"line":9,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":10},"filename":"/cases/includes.pug","end":{"line":9,"column":32}},"name":"type","mustEscape":true,"val":"\"text/javascript\""}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":32},"filename":"/cases/includes.pug","end":{"line":9,"column":33}}}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/includes.pug","end":{"line":10,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":10,"column":5},"filename":"/cases/includes.pug","end":{"line":10,"column":12}}}
+{"type":"filter","loc":{"start":{"line":10,"column":12},"filename":"/cases/includes.pug","end":{"line":10,"column":21}},"val":"verbatim"}
+{"type":"path","loc":{"start":{"line":10,"column":22},"filename":"/cases/includes.pug","end":{"line":10,"column":45}},"val":"auxiliary/includable.js"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/includes.pug","end":{"line":11,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/includes.pug","end":{"line":11,"column":1}}}
+{"type":"eos","loc":{"start":{"line":11,"column":1},"filename":"/cases/includes.pug","end":{"line":11,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json b/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json
index 706f0bf0d..034dddaec 100644
--- a/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.alert-dialog.tokens.json
@@ -1,13 +1,13 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/dialog.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"h1"}
-{"type":"text","line":5,"col":6,"val":"Alert!"}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"p"}
-{"type":"text","line":6,"col":5,"val":"I'm an alert!"}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":2,"column":29}},"val":"auxiliary/dialog.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":4,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":5,"column":5}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":5,"column":6},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":5,"column":12}},"val":"Alert!"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":6,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":6,"column":18}},"val":"I'm an alert!"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.alert-dialog.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.defaults.tokens.json b/packages/pug-parser/test/cases/inheritance.defaults.tokens.json
index d51e50c4e..947532541 100644
--- a/packages/pug-parser/test/cases/inheritance.defaults.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.defaults.tokens.json
@@ -1,24 +1,24 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"block","line":3,"col":5,"val":"head","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"script"}
-{"type":"start-attributes","line":4,"col":13}
-{"type":"attribute","line":4,"col":14,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":7,"val":"script"}
-{"type":"start-attributes","line":5,"col":13}
-{"type":"attribute","line":5,"col":14,"name":"src","val":"'keymaster.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":32}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":7,"val":"script"}
-{"type":"start-attributes","line":6,"col":13}
-{"type":"attribute","line":6,"col":14,"name":"src","val":"'caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":30}
-{"type":"outdent","line":6,"col":31}
-{"type":"outdent","line":6,"col":31}
-{"type":"outdent","line":6,"col":31}
-{"type":"eos","line":6,"col":31}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/inheritance.defaults.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"block","loc":{"start":{"line":3,"column":5},"filename":"/cases/inheritance.defaults.pug","end":{"line":3,"column":15}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":13},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":14},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":29}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/inheritance.defaults.pug","end":{"line":4,"column":30}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":7}}}
+{"type":"tag","loc":{"start":{"line":5,"column":7},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":13},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":14},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":32}},"name":"src","mustEscape":true,"val":"'keymaster.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":32},"filename":"/cases/inheritance.defaults.pug","end":{"line":5,"column":33}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":7}}}
+{"type":"tag","loc":{"start":{"line":6,"column":7},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":13},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":14},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":30}},"name":"src","mustEscape":true,"val":"'caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":30},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
+{"type":"eos","loc":{"start":{"line":6,"column":31},"filename":"/cases/inheritance.defaults.pug","end":{"line":6,"column":31}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json
index a1477cd02..101687b91 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.include.tokens.json
@@ -1,28 +1,28 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.include.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"outdent","line":7,"col":1}
-{"type":"block","line":7,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"h2"}
-{"type":"text","line":8,"col":6,"val":"Page"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"p"}
-{"type":"text","line":9,"col":5,"val":"Some content"}
-{"type":"outdent","line":11,"col":1}
-{"type":"block","line":11,"col":1,"val":"window-content","mode":"replace"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"tag","line":12,"col":3,"val":"h2"}
-{"type":"text","line":12,"col":6,"val":"Awesome"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":3,"val":"p"}
-{"type":"text","line":13,"col":5,"val":"Now we can extend included blocks!"}
-{"type":"outdent","line":14,"col":1}
-{"type":"eos","line":14,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.include.pug","end":{"line":2,"column":36}},"val":"auxiliary/layout.include.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/inheritance.extend.include.pug","end":{"line":5,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":7,"column":1}}}
+{"type":"block","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":7,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":8,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/inheritance.extend.include.pug","end":{"line":8,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":9,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/inheritance.extend.include.pug","end":{"line":9,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":11,"column":1}}}
+{"type":"block","loc":{"start":{"line":11,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":11,"column":21}},"val":"window-content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":12,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":12,"column":6},"filename":"/cases/inheritance.extend.include.pug","end":{"line":12,"column":13}},"val":"Awesome"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":13,"column":3}}}
+{"type":"tag","loc":{"start":{"line":13,"column":3},"filename":"/cases/inheritance.extend.include.pug","end":{"line":13,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":13,"column":5},"filename":"/cases/inheritance.extend.include.pug","end":{"line":13,"column":39}},"val":"Now we can extend included blocks!"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":14,"column":1}}}
+{"type":"eos","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.include.pug","end":{"line":14,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json
index c8668e8af..5d425f34a 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.mixins.block.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":8,"val":"auxiliary/inheritance.extend.mixin.block.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"text","line":4,"col":5,"val":"Hello World!"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":1,"column":7}}}
+{"type":"path","loc":{"start":{"line":1,"column":8},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":1,"column":52}},"val":"auxiliary/inheritance.extend.mixin.block.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":3,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":4,"column":17}},"val":"Hello World!"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.mixins.block.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json
index 135fb0215..595396f91 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.mixins.tokens.json
@@ -1,22 +1,22 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"mixin","line":4,"col":1,"val":"article","args":"title"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"if","line":5,"col":3,"val":"title"}
-{"type":"indent","line":6,"col":1,"val":4}
-{"type":"tag","line":6,"col":5,"val":"h1"}
-{"type":"code","line":6,"col":7,"val":"title","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"mixin-block","line":7,"col":3}
-{"type":"outdent","line":9,"col":1}
-{"type":"block","line":9,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"call","line":10,"col":3,"val":"article","args":"\"The meaning of life\""}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"tag","line":11,"col":5,"val":"p"}
-{"type":"text","line":11,"col":7,"val":"Foo bar baz!"}
-{"type":"outdent","line":12,"col":3}
-{"type":"outdent","line":12,"col":1}
-{"type":"eos","line":12,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":2,"column":28}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":4,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":4,"column":21}},"val":"article","args":"title"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"if","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":5,"column":11}},"val":"title"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":6,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":6,"column":7}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":6,"column":7},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":6,"column":14}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":7,"column":3}}}
+{"type":"mixin-block","loc":{"start":{"line":7,"column":3},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":7,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":9,"column":1}}}
+{"type":"block","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":9,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":10,"column":3},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":10,"column":34}},"val":"article","args":"\"The meaning of life\""}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":11,"column":5},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":11,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":11,"column":7},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":11,"column":19}},"val":"Foo bar baz!"}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":12,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":12,"column":1}}}
+{"type":"eos","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.mixins.pug","end":{"line":12,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json
index 817ec15f4..ed6ed9126 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.recursive.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"/auxiliary/inheritance.extend.recursive-parent.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"parent","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"h4"}
-{"type":"text","line":4,"col":8,"val":"child"}
-{"type":"outdent","line":4,"col":13}
-{"type":"eos","line":4,"col":13}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":1,"column":59}},"val":"/auxiliary/inheritance.extend.recursive-parent.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":3,"column":13}},"val":"parent","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":7}},"val":"h4"}
+{"type":"text","loc":{"start":{"line":4,"column":8},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":13}},"val":"child"}
+{"type":"outdent","loc":{"start":{"line":4,"column":13},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":13}}}
+{"type":"eos","loc":{"start":{"line":4,"column":13},"filename":"/cases/inheritance.extend.recursive.pug","end":{"line":4,"column":13}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.tokens.json
index 9423547f0..77418592b 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"outdent","line":7,"col":1}
-{"type":"block","line":7,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"h2"}
-{"type":"text","line":8,"col":6,"val":"Page"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"p"}
-{"type":"text","line":9,"col":5,"val":"Some content"}
-{"type":"outdent","line":10,"col":1}
-{"type":"eos","line":10,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.pug","end":{"line":2,"column":28}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/inheritance.extend.pug","end":{"line":5,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":7,"column":1}}}
+{"type":"block","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":7,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/inheritance.extend.pug","end":{"line":8,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/inheritance.extend.pug","end":{"line":8,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/inheritance.extend.pug","end":{"line":9,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/inheritance.extend.pug","end":{"line":9,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":10,"column":1}}}
+{"type":"eos","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.extend.pug","end":{"line":10,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json b/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json
index 8c85f5bcf..f22e409c9 100644
--- a/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.extend.whitespace.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":8,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":25}
-{"type":"outdent","line":8,"col":1}
-{"type":"block","line":8,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"tag","line":12,"col":3,"val":"h2"}
-{"type":"text","line":12,"col":6,"val":"Page"}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":3,"val":"p"}
-{"type":"text","line":13,"col":5,"val":"Some content"}
-{"type":"outdent","line":14,"col":1}
-{"type":"eos","line":14,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":2,"column":7}}}
+{"type":"path","loc":{"start":{"line":2,"column":8},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":2,"column":28}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":25},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":6,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":8,"column":1}}}
+{"type":"block","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":8,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":12,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":12,"column":6},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":12,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":13,"column":3}}}
+{"type":"tag","loc":{"start":{"line":13,"column":3},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":13,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":13,"column":5},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":13,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":14,"column":1}}}
+{"type":"eos","loc":{"start":{"line":14,"column":1},"filename":"/cases/inheritance.extend.whitespace.pug","end":{"line":14,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inheritance.tokens.json b/packages/pug-parser/test/cases/inheritance.tokens.json
index 27c5d259a..5e6703d3c 100644
--- a/packages/pug-parser/test/cases/inheritance.tokens.json
+++ b/packages/pug-parser/test/cases/inheritance.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"auxiliary/layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"replace"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":25}
-{"type":"outdent","line":7,"col":1}
-{"type":"block","line":7,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"h2"}
-{"type":"text","line":8,"col":6,"val":"Page"}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":3,"val":"p"}
-{"type":"text","line":9,"col":5,"val":"Some content"}
-{"type":"outdent","line":10,"col":1}
-{"type":"eos","line":10,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/inheritance.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/inheritance.pug","end":{"line":2,"column":29}},"val":"auxiliary/layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/inheritance.pug","end":{"line":4,"column":11}},"val":"head","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/inheritance.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/inheritance.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/inheritance.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/inheritance.pug","end":{"line":5,"column":25}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":25},"filename":"/cases/inheritance.pug","end":{"line":5,"column":26}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.pug","end":{"line":7,"column":1}}}
+{"type":"block","loc":{"start":{"line":7,"column":1},"filename":"/cases/inheritance.pug","end":{"line":7,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/inheritance.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/inheritance.pug","end":{"line":8,"column":5}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/inheritance.pug","end":{"line":8,"column":10}},"val":"Page"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inheritance.pug","end":{"line":9,"column":3}}}
+{"type":"tag","loc":{"start":{"line":9,"column":3},"filename":"/cases/inheritance.pug","end":{"line":9,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/inheritance.pug","end":{"line":9,"column":17}},"val":"Some content"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.pug","end":{"line":10,"column":1}}}
+{"type":"eos","loc":{"start":{"line":10,"column":1},"filename":"/cases/inheritance.pug","end":{"line":10,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inline-block-comment.tokens.json b/packages/pug-parser/test/cases/inline-block-comment.tokens.json
index d4bbbfe5d..6aa644fe6 100644
--- a/packages/pug-parser/test/cases/inline-block-comment.tokens.json
+++ b/packages/pug-parser/test/cases/inline-block-comment.tokens.json
@@ -1,10 +1,10 @@
-{"type":"block","line":1,"col":1,"val":"content","mode":"replace"}
-{"type":"comment","line":1,"col":1,"val":" Main content goes here","buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"block","line":2,"col":1,"val":"content","mode":"append"}
-{"type":"comment","line":2,"col":1,"val":" adding something to content","buffer":true}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"prepend"}
-{"type":"comment","line":3,"col":1,"val":" adding something to other end of content","buffer":true}
-{"type":"newline","line":4,"col":1}
-{"type":"eos","line":4,"col":1}
\ No newline at end of file
+{"type":"block","loc":{"start":{"line":1,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":1,"column":14}},"val":"content","mode":"replace"}
+{"type":"comment","loc":{"start":{"line":1,"column":15},"filename":"/cases/inline-block-comment.pug","end":{"line":1,"column":40}},"val":" Main content goes here","buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":2,"column":1}}}
+{"type":"block","loc":{"start":{"line":2,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":2,"column":15}},"val":"content","mode":"append"}
+{"type":"comment","loc":{"start":{"line":2,"column":16},"filename":"/cases/inline-block-comment.pug","end":{"line":2,"column":46}},"val":" adding something to content","buffer":true}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":3,"column":16}},"val":"content","mode":"prepend"}
+{"type":"comment","loc":{"start":{"line":3,"column":17},"filename":"/cases/inline-block-comment.pug","end":{"line":3,"column":60}},"val":" adding something to other end of content","buffer":true}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":4,"column":1}}}
+{"type":"eos","loc":{"start":{"line":4,"column":1},"filename":"/cases/inline-block-comment.pug","end":{"line":4,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/inline-tag.tokens.json b/packages/pug-parser/test/cases/inline-tag.tokens.json
index 55a7d2e02..2179a4fb0 100644
--- a/packages/pug-parser/test/cases/inline-tag.tokens.json
+++ b/packages/pug-parser/test/cases/inline-tag.tokens.json
@@ -1,77 +1,77 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"bing "}
-{"type":"start-pug-interpolation","line":1,"col":8}
-{"type":"tag","line":1,"col":10,"val":"strong"}
-{"type":"text","line":1,"col":17,"val":"foo"}
-{"type":"end-pug-interpolation","line":1,"col":20}
-{"type":"text","line":1,"col":21,"val":" bong"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"dot","line":3,"col":2}
-{"type":"start-pipeless-text","line":3,"col":3}
-{"type":"text","line":4,"col":3,"val":"bing"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":5,"col":3}
-{"type":"tag","line":5,"col":5,"val":"strong"}
-{"type":"text","line":5,"col":12,"val":"foo"}
-{"type":"end-pug-interpolation","line":5,"col":15}
-{"type":"text","line":5,"col":16,"val":""}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":6,"col":3}
-{"type":"tag","line":6,"col":5,"val":"strong"}
-{"type":"code","line":6,"col":11,"val":"'[foo]'","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":6,"col":20}
-{"type":"text","line":6,"col":21,"val":""}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":7,"col":3}
-{"type":"code","line":7,"col":5,"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
-{"type":"end-pug-interpolation","line":7,"col":23}
-{"type":"text","line":7,"col":24,"val":""}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"bong"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":""}
-{"type":"end-pipeless-text","line":9,"col":3}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":1,"val":"p"}
-{"type":"indent","line":11,"col":1,"val":2}
-{"type":"text","line":11,"col":5,"val":"bing"}
-{"type":"newline","line":12,"col":1}
-{"type":"text","line":12,"col":5,"val":""}
-{"type":"start-pug-interpolation","line":12,"col":5}
-{"type":"tag","line":12,"col":7,"val":"strong"}
-{"type":"text","line":12,"col":14,"val":"foo"}
-{"type":"end-pug-interpolation","line":12,"col":17}
-{"type":"text","line":12,"col":18,"val":""}
-{"type":"newline","line":13,"col":1}
-{"type":"text","line":13,"col":5,"val":""}
-{"type":"start-pug-interpolation","line":13,"col":5}
-{"type":"tag","line":13,"col":7,"val":"strong"}
-{"type":"code","line":13,"col":13,"val":"'[foo]'","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":13,"col":22}
-{"type":"text","line":13,"col":23,"val":""}
-{"type":"newline","line":14,"col":1}
-{"type":"text","line":14,"col":5,"val":""}
-{"type":"start-pug-interpolation","line":14,"col":5}
-{"type":"code","line":14,"col":7,"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
-{"type":"end-pug-interpolation","line":14,"col":25}
-{"type":"text","line":14,"col":26,"val":""}
-{"type":"newline","line":15,"col":1}
-{"type":"text","line":15,"col":5,"val":"bong"}
-{"type":"outdent","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"p"}
-{"type":"dot","line":17,"col":2}
-{"type":"start-pipeless-text","line":17,"col":3}
-{"type":"text","line":18,"col":3,"val":"#[strong escaped]"}
-{"type":"newline","line":19,"col":1}
-{"type":"text","line":19,"col":3,"val":"#["}
-{"type":"start-pug-interpolation","line":19,"col":6}
-{"type":"tag","line":19,"col":8,"val":"strong"}
-{"type":"text","line":19,"col":15,"val":"escaped"}
-{"type":"end-pug-interpolation","line":19,"col":22}
-{"type":"text","line":19,"col":23,"val":""}
-{"type":"end-pipeless-text","line":19,"col":23}
-{"type":"eos","line":19,"col":23}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":8}},"val":"bing "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":1,"column":8},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":10}}}
+{"type":"tag","loc":{"start":{"line":1,"column":10},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":16}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":1,"column":17},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":20}},"val":"foo"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":1,"column":20},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":21}}}
+{"type":"text","loc":{"start":{"line":1,"column":21},"filename":"/cases/inline-tag.pug","end":{"line":1,"column":26}},"val":" bong"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":3,"column":2},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":3}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":4,"column":7}},"val":"bing"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":5,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":5}}}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":11}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":5,"column":12},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":15}},"val":"foo"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":5,"column":15},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":16}}}
+{"type":"text","loc":{"start":{"line":5,"column":16},"filename":"/cases/inline-tag.pug","end":{"line":5,"column":16}},"val":""}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":3}}}
+{"type":"text","loc":{"start":{"line":6,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":6,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":5}}}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":11}},"val":"strong"}
+{"type":"code","loc":{"start":{"line":6,"column":11},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":20}},"val":"'[foo]'","mustEscape":true,"buffer":true}
+{"type":"end-pug-interpolation","loc":{"start":{"line":6,"column":20},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":21}}}
+{"type":"text","loc":{"start":{"line":6,"column":21},"filename":"/cases/inline-tag.pug","end":{"line":6,"column":21}},"val":""}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":3}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":7,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":5}}}
+{"type":"code","loc":{"start":{"line":7,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":23}},"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
+{"type":"end-pug-interpolation","loc":{"start":{"line":7,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":24}}}
+{"type":"text","loc":{"start":{"line":7,"column":24},"filename":"/cases/inline-tag.pug","end":{"line":7,"column":24}},"val":""}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":8,"column":7}},"val":"bong"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":9,"column":1}}}
+{"type":"text","loc":{"start":{"line":9,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":9,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":9,"column":1}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":10,"column":1}}}
+{"type":"tag","loc":{"start":{"line":10,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":10,"column":2}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":11,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":11,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":11,"column":9}},"val":"bing"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":3}}}
+{"type":"text","loc":{"start":{"line":12,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":5}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":12,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":7}}}
+{"type":"tag","loc":{"start":{"line":12,"column":7},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":13}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":12,"column":14},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":17}},"val":"foo"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":12,"column":17},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":18}}}
+{"type":"text","loc":{"start":{"line":12,"column":18},"filename":"/cases/inline-tag.pug","end":{"line":12,"column":18}},"val":""}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":3}}}
+{"type":"text","loc":{"start":{"line":13,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":5}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":13,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":7}}}
+{"type":"tag","loc":{"start":{"line":13,"column":7},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":13}},"val":"strong"}
+{"type":"code","loc":{"start":{"line":13,"column":13},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":22}},"val":"'[foo]'","mustEscape":true,"buffer":true}
+{"type":"end-pug-interpolation","loc":{"start":{"line":13,"column":22},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":23}}}
+{"type":"text","loc":{"start":{"line":13,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":13,"column":23}},"val":""}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":3}}}
+{"type":"text","loc":{"start":{"line":14,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":5}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":14,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":7}}}
+{"type":"code","loc":{"start":{"line":14,"column":7},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":25}},"val":"var foo = 'foo]'","mustEscape":false,"buffer":false}
+{"type":"end-pug-interpolation","loc":{"start":{"line":14,"column":25},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":26}}}
+{"type":"text","loc":{"start":{"line":14,"column":26},"filename":"/cases/inline-tag.pug","end":{"line":14,"column":26}},"val":""}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":15,"column":3}}}
+{"type":"text","loc":{"start":{"line":15,"column":5},"filename":"/cases/inline-tag.pug","end":{"line":15,"column":9}},"val":"bong"}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":17,"column":2},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":3}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":17,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":17,"column":3}}}
+{"type":"text","loc":{"start":{"line":18,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":18,"column":21}},"val":"#[strong escaped]"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":3}}}
+{"type":"text","loc":{"start":{"line":19,"column":3},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":6}},"val":"#["}
+{"type":"start-pug-interpolation","loc":{"start":{"line":19,"column":6},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":8}}}
+{"type":"tag","loc":{"start":{"line":19,"column":8},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":14}},"val":"strong"}
+{"type":"text","loc":{"start":{"line":19,"column":15},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":22}},"val":"escaped"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":19,"column":22},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}}}
+{"type":"text","loc":{"start":{"line":19,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":19,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}}}
+{"type":"eos","loc":{"start":{"line":19,"column":23},"filename":"/cases/inline-tag.pug","end":{"line":19,"column":23}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/intepolated-elements.tokens.json b/packages/pug-parser/test/cases/intepolated-elements.tokens.json
index 48ff6917b..101b41c13 100644
--- a/packages/pug-parser/test/cases/intepolated-elements.tokens.json
+++ b/packages/pug-parser/test/cases/intepolated-elements.tokens.json
@@ -1,38 +1,38 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":""}
-{"type":"start-pug-interpolation","line":1,"col":3}
-{"type":"tag","line":1,"col":5,"val":"a"}
-{"type":"class","line":1,"col":6,"val":"rho"}
-{"type":"start-attributes","line":1,"col":10}
-{"type":"attribute","line":1,"col":11,"name":"href","val":"'#'","mustEscape":true}
-{"type":"attribute","line":1,"col":21,"name":"class","val":"'rho--modifier'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":42}
-{"type":"text","line":1,"col":44,"val":"with inline link"}
-{"type":"end-pug-interpolation","line":1,"col":60}
-{"type":"text","line":1,"col":61,"val":""}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"text","line":2,"col":3,"val":"Some text "}
-{"type":"start-pug-interpolation","line":2,"col":13}
-{"type":"tag","line":2,"col":15,"val":"a"}
-{"type":"class","line":2,"col":16,"val":"rho"}
-{"type":"start-attributes","line":2,"col":20}
-{"type":"attribute","line":2,"col":21,"name":"href","val":"'#'","mustEscape":true}
-{"type":"attribute","line":2,"col":31,"name":"class","val":"'rho--modifier'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":52}
-{"type":"end-pug-interpolation","line":2,"col":53}
-{"type":"text","line":2,"col":54,"val":""}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"text","line":3,"col":3,"val":"Some text "}
-{"type":"start-pug-interpolation","line":3,"col":13}
-{"type":"tag","line":3,"col":15,"val":"a"}
-{"type":"class","line":3,"col":16,"val":"rho"}
-{"type":"start-attributes","line":3,"col":20}
-{"type":"attribute","line":3,"col":21,"name":"href","val":"'#'","mustEscape":true}
-{"type":"attribute","line":3,"col":31,"name":"class","val":"'rho--modifier'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":52}
-{"type":"text","line":3,"col":54,"val":"with inline link"}
-{"type":"end-pug-interpolation","line":3,"col":70}
-{"type":"text","line":3,"col":71,"val":""}
-{"type":"eos","line":3,"col":71}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":3}},"val":""}
+{"type":"start-pug-interpolation","loc":{"start":{"line":1,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":5}}}
+{"type":"tag","loc":{"start":{"line":1,"column":5},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":6}},"val":"a"}
+{"type":"class","loc":{"start":{"line":1,"column":6},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":10}},"val":"rho"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":10},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":11},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":19}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"attribute","loc":{"start":{"line":1,"column":21},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":42}},"name":"class","mustEscape":true,"val":"'rho--modifier'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":42},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":43}}}
+{"type":"text","loc":{"start":{"line":1,"column":44},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":60}},"val":"with inline link"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":1,"column":60},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":61}}}
+{"type":"text","loc":{"start":{"line":1,"column":61},"filename":"/cases/intepolated-elements.pug","end":{"line":1,"column":61}},"val":""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":13}},"val":"Some text "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":2,"column":13},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":15}}}
+{"type":"tag","loc":{"start":{"line":2,"column":15},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":16}},"val":"a"}
+{"type":"class","loc":{"start":{"line":2,"column":16},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":20}},"val":"rho"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":20},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":21},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":29}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"attribute","loc":{"start":{"line":2,"column":31},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":52}},"name":"class","mustEscape":true,"val":"'rho--modifier'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":52},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":53}}}
+{"type":"end-pug-interpolation","loc":{"start":{"line":2,"column":53},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":54}}}
+{"type":"text","loc":{"start":{"line":2,"column":54},"filename":"/cases/intepolated-elements.pug","end":{"line":2,"column":54}},"val":""}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":13}},"val":"Some text "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":3,"column":13},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":15}}}
+{"type":"tag","loc":{"start":{"line":3,"column":15},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":16}},"val":"a"}
+{"type":"class","loc":{"start":{"line":3,"column":16},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":20}},"val":"rho"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":20},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":21},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":29}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":31},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":52}},"name":"class","mustEscape":true,"val":"'rho--modifier'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":52},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":53}}}
+{"type":"text","loc":{"start":{"line":3,"column":54},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":70}},"val":"with inline link"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":3,"column":70},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":71}}}
+{"type":"text","loc":{"start":{"line":3,"column":71},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":71}},"val":""}
+{"type":"eos","loc":{"start":{"line":3,"column":71},"filename":"/cases/intepolated-elements.pug","end":{"line":3,"column":71}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/interpolated-mixin.tokens.json b/packages/pug-parser/test/cases/interpolated-mixin.tokens.json
index d8b533889..3ca752250 100644
--- a/packages/pug-parser/test/cases/interpolated-mixin.tokens.json
+++ b/packages/pug-parser/test/cases/interpolated-mixin.tokens.json
@@ -1,15 +1,15 @@
-{"type":"mixin","line":1,"col":1,"val":"linkit","args":"url"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"a"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"href","val":"url","mustEscape":true}
-{"type":"end-attributes","line":2,"col":13}
-{"type":"code","line":2,"col":14,"val":"url","mustEscape":true,"buffer":true}
-{"type":"outdent","line":4,"col":1}
-{"type":"tag","line":4,"col":1,"val":"p"}
-{"type":"text","line":4,"col":3,"val":"This also works "}
-{"type":"start-pug-interpolation","line":4,"col":19}
-{"type":"call","line":4,"col":21,"val":"linkit","args":"'http://www.bing.com'"}
-{"type":"end-pug-interpolation","line":4,"col":51}
-{"type":"text","line":4,"col":52,"val":" so hurrah for Pug"}
-{"type":"eos","line":4,"col":70}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":1,"column":18}},"val":"linkit","args":"url"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":4}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":13}},"name":"href","mustEscape":true,"val":"url"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":13},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":14}}}
+{"type":"code","loc":{"start":{"line":2,"column":14},"filename":"/cases/interpolated-mixin.pug","end":{"line":2,"column":19}},"val":"url","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":1}}}
+{"type":"tag","loc":{"start":{"line":4,"column":1},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":19}},"val":"This also works "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":4,"column":19},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":21}}}
+{"type":"call","loc":{"start":{"line":4,"column":21},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":51}},"val":"linkit","args":"'http://www.bing.com'"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":4,"column":51},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":52}}}
+{"type":"text","loc":{"start":{"line":4,"column":52},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":70}},"val":" so hurrah for Pug"}
+{"type":"eos","loc":{"start":{"line":4,"column":70},"filename":"/cases/interpolated-mixin.pug","end":{"line":4,"column":70}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/interpolation.escape.tokens.json b/packages/pug-parser/test/cases/interpolation.escape.tokens.json
index 8f45d9d08..4eff64156 100644
--- a/packages/pug-parser/test/cases/interpolation.escape.tokens.json
+++ b/packages/pug-parser/test/cases/interpolation.escape.tokens.json
@@ -1,15 +1,15 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var id = 42;","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"foo"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"text","line":4,"col":5,"val":"some"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":5,"val":"#{text}"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":5,"val":"here"}
-{"type":"newline","line":7,"col":1}
-{"type":"text","line":7,"col":5,"val":"My ID "}
-{"type":"interpolated-code","line":7,"col":11,"val":"\"is {\" + id + \"}\"","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":31}
-{"type":"eos","line":7,"col":31}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":2,"column":15}},"val":"var id = 42;","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":3,"column":4}},"val":"foo"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":4,"column":9}},"val":"some"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":5,"column":13}},"val":"#{text}"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":6,"column":3}}}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":6,"column":9}},"val":"here"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":3}}}
+{"type":"text","loc":{"start":{"line":7,"column":5},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":11}},"val":"My ID "}
+{"type":"interpolated-code","loc":{"start":{"line":7,"column":11},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":31}},"mustEscape":true,"buffer":true,"val":"\"is {\" + id + \"}\""}
+{"type":"outdent","loc":{"start":{"line":7,"column":31},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":31}}}
+{"type":"eos","loc":{"start":{"line":7,"column":31},"filename":"/cases/interpolation.escape.pug","end":{"line":7,"column":31}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.append.tokens.json b/packages/pug-parser/test/cases/layout.append.tokens.json
index c3d6ef903..11390788e 100644
--- a/packages/pug-parser/test/cases/layout.append.tokens.json
+++ b/packages/pug-parser/test/cases/layout.append.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/append/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"append"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.append.pug","end":{"line":2,"column":42}},"val":"../fixtures/append/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.pug","end":{"line":4,"column":18}},"val":"head","mode":"append"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.append.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.append.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.append.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.append.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.append.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.append.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.append.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.append.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.append.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.append.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.append.without-block.tokens.json b/packages/pug-parser/test/cases/layout.append.without-block.tokens.json
index eddf3e8c4..fc737ffe7 100644
--- a/packages/pug-parser/test/cases/layout.append.without-block.tokens.json
+++ b/packages/pug-parser/test/cases/layout.append.without-block.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/append-without-block/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"append"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.append.without-block.pug","end":{"line":2,"column":56}},"val":"../fixtures/append-without-block/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":4,"column":12}},"val":"head","mode":"append"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.append.without-block.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.append.without-block.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.append.without-block.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json b/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json
index 9c9f9c9c9..b26acb825 100644
--- a/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json
+++ b/packages/pug-parser/test/cases/layout.multi.append.prepend.block.tokens.json
@@ -1,46 +1,46 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"../fixtures/multi-append-prepend-block/redefine.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"append"}
-{"type":"indent","line":4,"col":1,"val":1}
-{"type":"tag","line":4,"col":2,"val":"p"}
-{"type":"class","line":4,"col":3,"val":"first"}
-{"type":"class","line":4,"col":9,"val":"append"}
-{"type":"text","line":4,"col":17,"val":"Something appended to content"}
-{"type":"outdent","line":6,"col":1}
-{"type":"block","line":6,"col":1,"val":"content","mode":"prepend"}
-{"type":"indent","line":7,"col":1,"val":1}
-{"type":"tag","line":7,"col":2,"val":"p"}
-{"type":"class","line":7,"col":3,"val":"first"}
-{"type":"class","line":7,"col":9,"val":"prepend"}
-{"type":"text","line":7,"col":18,"val":"Something prepended to content"}
-{"type":"outdent","line":9,"col":1}
-{"type":"block","line":9,"col":1,"val":"content","mode":"append"}
-{"type":"indent","line":10,"col":1,"val":1}
-{"type":"tag","line":10,"col":2,"val":"p"}
-{"type":"class","line":10,"col":3,"val":"last"}
-{"type":"class","line":10,"col":8,"val":"append"}
-{"type":"text","line":10,"col":16,"val":"Last append must be most last"}
-{"type":"outdent","line":12,"col":1}
-{"type":"block","line":12,"col":1,"val":"content","mode":"prepend"}
-{"type":"indent","line":13,"col":1,"val":1}
-{"type":"tag","line":13,"col":2,"val":"p"}
-{"type":"class","line":13,"col":3,"val":"last"}
-{"type":"class","line":13,"col":8,"val":"prepend"}
-{"type":"text","line":13,"col":17,"val":"Last prepend must appear at top"}
-{"type":"outdent","line":15,"col":1}
-{"type":"block","line":15,"col":1,"val":"head","mode":"append"}
-{"type":"indent","line":16,"col":1,"val":1}
-{"type":"tag","line":16,"col":2,"val":"script"}
-{"type":"start-attributes","line":16,"col":8}
-{"type":"attribute","line":16,"col":9,"name":"src","val":"'jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":16,"col":24}
-{"type":"outdent","line":18,"col":1}
-{"type":"block","line":18,"col":1,"val":"head","mode":"prepend"}
-{"type":"indent","line":19,"col":1,"val":1}
-{"type":"tag","line":19,"col":2,"val":"script"}
-{"type":"start-attributes","line":19,"col":8}
-{"type":"attribute","line":19,"col":9,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":19,"col":21}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":1,"column":60}},"val":"../fixtures/multi-append-prepend-block/redefine.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":3,"column":15}},"val":"content","mode":"append"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":4,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":4,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":9}},"val":"first"}
+{"type":"class","loc":{"start":{"line":4,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":16}},"val":"append"}
+{"type":"text","loc":{"start":{"line":4,"column":17},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":4,"column":46}},"val":"Something appended to content"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":6,"column":1}}}
+{"type":"block","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":6,"column":16}},"val":"content","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":7,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":7,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":9}},"val":"first"}
+{"type":"class","loc":{"start":{"line":7,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":17}},"val":"prepend"}
+{"type":"text","loc":{"start":{"line":7,"column":18},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":7,"column":48}},"val":"Something prepended to content"}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":9,"column":1}}}
+{"type":"block","loc":{"start":{"line":9,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":9,"column":15}},"val":"content","mode":"append"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":10,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":10,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":8}},"val":"last"}
+{"type":"class","loc":{"start":{"line":10,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":15}},"val":"append"}
+{"type":"text","loc":{"start":{"line":10,"column":16},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":10,"column":45}},"val":"Last append must be most last"}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":12,"column":1}}}
+{"type":"block","loc":{"start":{"line":12,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":12,"column":16}},"val":"content","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":13,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":3}},"val":"p"}
+{"type":"class","loc":{"start":{"line":13,"column":3},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":8}},"val":"last"}
+{"type":"class","loc":{"start":{"line":13,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":16}},"val":"prepend"}
+{"type":"text","loc":{"start":{"line":13,"column":17},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":13,"column":48}},"val":"Last prepend must appear at top"}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":15,"column":1}}}
+{"type":"block","loc":{"start":{"line":15,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":15,"column":12}},"val":"head","mode":"append"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":16,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":8}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":16,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":16,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":24}},"name":"src","mustEscape":true,"val":"'jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":16,"column":24},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":16,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":18,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":18,"column":1}}}
+{"type":"block","loc":{"start":{"line":18,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":18,"column":13}},"val":"head","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":2}},"val":1}
+{"type":"tag","loc":{"start":{"line":19,"column":2},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":8}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":8},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":9},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":21}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":21},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":19,"column":22}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/layout.multi.append.prepend.block.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.prepend.tokens.json b/packages/pug-parser/test/cases/layout.prepend.tokens.json
index 49d28746d..5651cfe66 100644
--- a/packages/pug-parser/test/cases/layout.prepend.tokens.json
+++ b/packages/pug-parser/test/cases/layout.prepend.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/prepend/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"prepend"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.prepend.pug","end":{"line":2,"column":43}},"val":"../fixtures/prepend/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":4,"column":19}},"val":"head","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.prepend.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.prepend.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json b/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json
index 459cb0604..8f2bbd62e 100644
--- a/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json
+++ b/packages/pug-parser/test/cases/layout.prepend.without-block.tokens.json
@@ -1,17 +1,17 @@
-{"type":"newline","line":2,"col":1}
-{"type":"extends","line":2,"col":1}
-{"type":"path","line":2,"col":9,"val":"../fixtures/prepend-without-block/app-layout.pug"}
-{"type":"newline","line":4,"col":1}
-{"type":"block","line":4,"col":1,"val":"head","mode":"prepend"}
-{"type":"indent","line":5,"col":1,"val":2}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'foo.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":22}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"script"}
-{"type":"start-attributes","line":6,"col":9}
-{"type":"attribute","line":6,"col":10,"name":"src","val":"'bar.js'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":22}
-{"type":"outdent","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":2,"column":1}}}
+{"type":"extends","loc":{"start":{"line":2,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":2,"column":8}}}
+{"type":"path","loc":{"start":{"line":2,"column":9},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":2,"column":57}},"val":"../fixtures/prepend-without-block/app-layout.pug"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":4,"column":1}}}
+{"type":"block","loc":{"start":{"line":4,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":4,"column":13}},"val":"head","mode":"prepend"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":22}},"name":"src","mustEscape":true,"val":"'foo.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":22},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":5,"column":23}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":9},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":10},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":22}},"name":"src","mustEscape":true,"val":"'bar.js'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":22},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":6,"column":23}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/layout.prepend.without-block.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json b/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json
index 85fead42b..bbbc36733 100644
--- a/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-at-end-of-file.tokens.json
@@ -1,9 +1,9 @@
-{"type":"include","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/mixin-at-end-of-file.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"call","line":3,"col":1,"val":"slide","args":""}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"text","line":4,"col":5,"val":"some awesome content"}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"include","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":1,"column":45}},"val":"./auxiliary/mixin-at-end-of-file.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":3,"column":1}}}
+{"type":"call","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":3,"column":9}},"val":"slide","args":""}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":5},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":4,"column":25}},"val":"some awesome content"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-at-end-of-file.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json b/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json
index 650178dc1..9a882c980 100644
--- a/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-block-with-space.tokens.json
@@ -1,12 +1,12 @@
-{"type":"mixin","line":1,"col":1,"val":"m","args":"id"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"div"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"mixin-block","line":3,"col":5}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"call","line":5,"col":1,"val":"m","args":""}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"text","line":6,"col":5,"val":"This text should appear"}
-{"type":"outdent","line":6,"col":28}
-{"type":"eos","line":6,"col":28}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":1,"column":12}},"val":"m","args":"id"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixin-block-with-space.pug","end":{"line":2,"column":6}},"val":"div"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"mixin-block","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixin-block-with-space.pug","end":{"line":3,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":5,"column":1}}}
+{"type":"call","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":5,"column":5}},"val":"m","args":""}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":6,"column":5},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":28}},"val":"This text should appear"}
+{"type":"outdent","loc":{"start":{"line":6,"column":28},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":28}}}
+{"type":"eos","loc":{"start":{"line":6,"column":28},"filename":"/cases/mixin-block-with-space.pug","end":{"line":6,"column":28}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-hoist.tokens.json b/packages/pug-parser/test/cases/mixin-hoist.tokens.json
index 692e9504a..927dcca69 100644
--- a/packages/pug-parser/test/cases/mixin-hoist.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-hoist.tokens.json
@@ -1,14 +1,14 @@
-{"type":"newline","line":2,"col":1}
-{"type":"mixin","line":2,"col":1,"val":"foo","args":null}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"h1"}
-{"type":"code","line":3,"col":5,"val":"title","mustEscape":true,"buffer":true}
-{"type":"outdent","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"html"}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"tag","line":6,"col":3,"val":"body"}
-{"type":"indent","line":7,"col":1,"val":4}
-{"type":"call","line":7,"col":5,"val":"foo","args":null}
-{"type":"outdent","line":8,"col":3}
-{"type":"outdent","line":8,"col":1}
-{"type":"eos","line":8,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":2,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":2,"column":12}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/mixin-hoist.pug","end":{"line":3,"column":5}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixin-hoist.pug","end":{"line":3,"column":12}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":5,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/mixin-hoist.pug","end":{"line":6,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":7,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":7,"column":5},"filename":"/cases/mixin-hoist.pug","end":{"line":7,"column":9}},"val":"foo","args":null}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":8,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":8,"column":1}}}
+{"type":"eos","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin-hoist.pug","end":{"line":8,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin-via-include.tokens.json b/packages/pug-parser/test/cases/mixin-via-include.tokens.json
index b803fca29..95c3d4759 100644
--- a/packages/pug-parser/test/cases/mixin-via-include.tokens.json
+++ b/packages/pug-parser/test/cases/mixin-via-include.tokens.json
@@ -1,7 +1,7 @@
-{"type":"comment","line":1,"col":1,"val":" regression test for https://github.com/pugjs/pug/issues/1435","buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"include","line":3,"col":1}
-{"type":"path","line":3,"col":9,"val":"../fixtures/mixin-include.pug"}
-{"type":"newline","line":5,"col":1}
-{"type":"call","line":5,"col":1,"val":"bang","args":null}
-{"type":"eos","line":5,"col":6}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":1,"column":65}},"val":" regression test for https://github.com/pugjs/pug/issues/1435","buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":1}}}
+{"type":"include","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":8}}}
+{"type":"path","loc":{"start":{"line":3,"column":9},"filename":"/cases/mixin-via-include.pug","end":{"line":3,"column":38}},"val":"../fixtures/mixin-include.pug"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":5,"column":1}}}
+{"type":"call","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin-via-include.pug","end":{"line":5,"column":6}},"val":"bang","args":null}
+{"type":"eos","loc":{"start":{"line":5,"column":6},"filename":"/cases/mixin-via-include.pug","end":{"line":5,"column":6}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.attrs.tokens.json b/packages/pug-parser/test/cases/mixin.attrs.tokens.json
index 7ba476c61..a36079e67 100644
--- a/packages/pug-parser/test/cases/mixin.attrs.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.attrs.tokens.json
@@ -1,161 +1,161 @@
-{"type":"mixin","line":1,"col":1,"val":"centered","args":"title"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"div"}
-{"type":"class","line":2,"col":6,"val":"centered"}
-{"type":"start-attributes","line":2,"col":15}
-{"type":"attribute","line":2,"col":16,"name":"id","val":"attributes.id","mustEscape":true}
-{"type":"end-attributes","line":2,"col":32}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"code","line":3,"col":5,"val":"if (title)","mustEscape":false,"buffer":false}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"h1"}
-{"type":"start-attributes","line":4,"col":9}
-{"type":"attribute","line":4,"col":10,"name":"class","val":"attributes.class","mustEscape":true}
-{"type":"end-attributes","line":4,"col":32}
-{"type":"code","line":4,"col":33,"val":"title","mustEscape":true,"buffer":true}
-{"type":"outdent","line":5,"col":5}
-{"type":"mixin-block","line":5,"col":5}
-{"type":"newline","line":6,"col":1}
-{"type":"code","line":6,"col":5,"val":"if (attributes.href)","mustEscape":false,"buffer":false}
-{"type":"indent","line":7,"col":1,"val":6}
-{"type":"class","line":7,"col":7,"val":"footer"}
-{"type":"indent","line":8,"col":1,"val":8}
-{"type":"tag","line":8,"col":9,"val":"a"}
-{"type":"start-attributes","line":8,"col":10}
-{"type":"attribute","line":8,"col":11,"name":"href","val":"attributes.href","mustEscape":true}
-{"type":"end-attributes","line":8,"col":31}
-{"type":"text","line":8,"col":33,"val":"Back"}
-{"type":"outdent","line":10,"col":7}
-{"type":"outdent","line":10,"col":5}
-{"type":"outdent","line":10,"col":3}
-{"type":"outdent","line":10,"col":1}
-{"type":"mixin","line":10,"col":1,"val":"main","args":"title"}
-{"type":"indent","line":11,"col":1,"val":2}
-{"type":"tag","line":11,"col":3,"val":"div"}
-{"type":"class","line":11,"col":6,"val":"stretch"}
-{"type":"indent","line":12,"col":1,"val":4}
-{"type":"call","line":12,"col":5,"val":"centered","args":"title"}
-{"type":"class","line":12,"col":21,"val":"highlight"}
-{"type":"&attributes","line":12,"col":31,"val":"attributes"}
-{"type":"indent","line":13,"col":1,"val":6}
-{"type":"mixin-block","line":13,"col":7}
-{"type":"outdent","line":15,"col":5}
-{"type":"outdent","line":15,"col":3}
-{"type":"outdent","line":15,"col":1}
-{"type":"mixin","line":15,"col":1,"val":"bottom","args":null}
-{"type":"indent","line":16,"col":1,"val":2}
-{"type":"tag","line":16,"col":3,"val":"div"}
-{"type":"class","line":16,"col":6,"val":"bottom"}
-{"type":"&attributes","line":16,"col":13,"val":"attributes"}
-{"type":"indent","line":17,"col":1,"val":4}
-{"type":"mixin-block","line":17,"col":5}
-{"type":"outdent","line":19,"col":3}
-{"type":"outdent","line":19,"col":1}
-{"type":"tag","line":19,"col":1,"val":"body"}
-{"type":"indent","line":20,"col":1,"val":2}
-{"type":"call","line":20,"col":3,"val":"centered","args":null}
-{"type":"id","line":20,"col":12,"val":"First"}
-{"type":"text","line":20,"col":19,"val":"Hello World"}
-{"type":"newline","line":21,"col":1}
-{"type":"call","line":21,"col":3,"val":"centered","args":"'Section 1'"}
-{"type":"id","line":21,"col":25,"val":"Second"}
-{"type":"indent","line":22,"col":1,"val":4}
-{"type":"tag","line":22,"col":5,"val":"p"}
-{"type":"text","line":22,"col":7,"val":"Some important content."}
-{"type":"outdent","line":23,"col":3}
-{"type":"call","line":23,"col":3,"val":"centered","args":"'Section 2'"}
-{"type":"id","line":23,"col":25,"val":"Third"}
-{"type":"class","line":23,"col":31,"val":"foo"}
-{"type":"start-attributes","line":23,"col":35}
-{"type":"attribute","line":23,"col":36,"name":"href","val":"'menu.html'","mustEscape":true}
-{"type":"attribute","line":23,"col":54,"name":"class","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":23,"col":65}
-{"type":"indent","line":24,"col":1,"val":4}
-{"type":"tag","line":24,"col":5,"val":"p"}
-{"type":"text","line":24,"col":7,"val":"Even more important content."}
-{"type":"outdent","line":25,"col":3}
-{"type":"call","line":25,"col":3,"val":"main","args":"'Section 3'"}
-{"type":"start-attributes","line":25,"col":21}
-{"type":"attribute","line":25,"col":22,"name":"href","val":"'#'","mustEscape":true}
-{"type":"end-attributes","line":25,"col":30}
-{"type":"indent","line":26,"col":1,"val":4}
-{"type":"tag","line":26,"col":5,"val":"p"}
-{"type":"text","line":26,"col":7,"val":"Last content."}
-{"type":"outdent","line":27,"col":3}
-{"type":"call","line":27,"col":3,"val":"bottom","args":null}
-{"type":"class","line":27,"col":10,"val":"foo"}
-{"type":"start-attributes","line":27,"col":14}
-{"type":"attribute","line":27,"col":15,"name":"class","val":"'bar'","mustEscape":true}
-{"type":"attribute","line":27,"col":28,"name":"name","val":"'end'","mustEscape":true}
-{"type":"attribute","line":27,"col":40,"name":"id","val":"'Last'","mustEscape":true}
-{"type":"attribute","line":27,"col":51,"name":"data-attr","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":27,"col":66}
-{"type":"indent","line":28,"col":1,"val":4}
-{"type":"tag","line":28,"col":5,"val":"p"}
-{"type":"text","line":28,"col":7,"val":"Some final words."}
-{"type":"outdent","line":29,"col":3}
-{"type":"call","line":29,"col":3,"val":"bottom","args":null}
-{"type":"start-attributes","line":29,"col":10}
-{"type":"attribute","line":29,"col":11,"name":"class","val":"['class1', 'class2']","mustEscape":true}
-{"type":"end-attributes","line":29,"col":37}
-{"type":"outdent","line":31,"col":1}
-{"type":"mixin","line":31,"col":1,"val":"foo","args":null}
-{"type":"indent","line":32,"col":1,"val":2}
-{"type":"tag","line":32,"col":3,"val":"div"}
-{"type":"class","line":32,"col":6,"val":"thing"}
-{"type":"start-attributes","line":32,"col":12}
-{"type":"attribute","line":32,"col":13,"name":"attr1","val":"'foo'","mustEscape":true}
-{"type":"attribute","line":32,"col":26,"name":"attr2","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":32,"col":37}
-{"type":"&attributes","line":32,"col":38,"val":"attributes"}
-{"type":"outdent","line":34,"col":1}
-{"type":"code","line":34,"col":1,"val":"var val = '<biz>'","mustEscape":false,"buffer":false}
-{"type":"newline","line":35,"col":1}
-{"type":"code","line":35,"col":1,"val":"var classes = ['foo', 'bar']","mustEscape":false,"buffer":false}
-{"type":"newline","line":36,"col":1}
-{"type":"call","line":36,"col":1,"val":"foo","args":null}
-{"type":"start-attributes","line":36,"col":5}
-{"type":"attribute","line":36,"col":6,"name":"attr3","val":"'baz'","mustEscape":true}
-{"type":"attribute","line":36,"col":18,"name":"data-foo","val":"val","mustEscape":true}
-{"type":"attribute","line":36,"col":31,"name":"data-bar","val":"val","mustEscape":false}
-{"type":"attribute","line":36,"col":45,"name":"class","val":"classes","mustEscape":true}
-{"type":"end-attributes","line":36,"col":58}
-{"type":"class","line":36,"col":59,"val":"thunk"}
-{"type":"newline","line":38,"col":1}
-{"type":"comment","line":38,"col":1,"val":" Regression test for #1424","buffer":false}
-{"type":"newline","line":39,"col":1}
-{"type":"mixin","line":39,"col":1,"val":"work_filmstrip_item","args":"work"}
-{"type":"indent","line":40,"col":1,"val":2}
-{"type":"tag","line":40,"col":3,"val":"div"}
-{"type":"&attributes","line":40,"col":6,"val":"attributes"}
-{"type":"code","line":40,"col":29,"val":"work","mustEscape":true,"buffer":true}
-{"type":"outdent","line":41,"col":1}
-{"type":"call","line":41,"col":1,"val":"work_filmstrip_item","args":"'work'"}
-{"type":"start-attributes","line":41,"col":29}
-{"type":"attribute","line":41,"col":31,"name":"data-profile","val":"'profile'","mustEscape":true}
-{"type":"attribute","line":41,"col":56,"name":"data-creator-name","val":"'name'","mustEscape":true}
-{"type":"end-attributes","line":41,"col":82}
-{"type":"newline","line":43,"col":1}
-{"type":"mixin","line":43,"col":1,"val":"my-mixin","args":"arg1, arg2, arg3, arg4"}
-{"type":"indent","line":44,"col":1,"val":2}
-{"type":"tag","line":44,"col":3,"val":"p"}
-{"type":"code","line":44,"col":4,"val":"arg1","mustEscape":true,"buffer":true}
-{"type":"newline","line":45,"col":1}
-{"type":"tag","line":45,"col":3,"val":"p"}
-{"type":"code","line":45,"col":4,"val":"arg2","mustEscape":true,"buffer":true}
-{"type":"newline","line":46,"col":1}
-{"type":"tag","line":46,"col":3,"val":"p"}
-{"type":"code","line":46,"col":4,"val":"arg3","mustEscape":true,"buffer":true}
-{"type":"newline","line":47,"col":1}
-{"type":"tag","line":47,"col":3,"val":"p"}
-{"type":"code","line":47,"col":4,"val":"arg4","mustEscape":true,"buffer":true}
-{"type":"outdent","line":49,"col":1}
-{"type":"call","line":49,"col":1,"val":"foo","args":null}
-{"type":"start-attributes","line":49,"col":5}
-{"type":"attribute","line":50,"col":3,"name":"attr3","val":"\"qux\"","mustEscape":true}
-{"type":"attribute","line":51,"col":3,"name":"class","val":"\"baz\"","mustEscape":true}
-{"type":"end-attributes","line":52,"col":1}
-{"type":"newline","line":54,"col":1}
-{"type":"call","line":54,"col":1,"val":"my-mixin","args":"\n'1',\n      '2',\n  '3',\n      '4'\n"}
-{"type":"newline","line":60,"col":1}
-{"type":"eos","line":60,"col":1}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":1,"column":22}},"val":"centered","args":"title"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":2,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":15}},"val":"centered"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":15},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":16}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":16},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":32}},"name":"id","mustEscape":true,"val":"attributes.id"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":32},"filename":"/cases/mixin.attrs.pug","end":{"line":2,"column":33}}}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":3,"column":17}},"val":"if (title)","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":9}},"val":"h1"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":9},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":32}},"name":"class","mustEscape":true,"val":"attributes.class"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":32},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":33}}}
+{"type":"code","loc":{"start":{"line":4,"column":33},"filename":"/cases/mixin.attrs.pug","end":{"line":4,"column":40}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":5,"column":5}}}
+{"type":"mixin-block","loc":{"start":{"line":5,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":5,"column":10}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":6,"column":5}}}
+{"type":"code","loc":{"start":{"line":6,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":6,"column":27}},"val":"if (attributes.href)","mustEscape":false,"buffer":false}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":7,"column":7}},"val":6}
+{"type":"class","loc":{"start":{"line":7,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":7,"column":14}},"val":"footer"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":8,"column":9},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":10}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":11},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":31}},"name":"href","mustEscape":true,"val":"attributes.href"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":32}}}
+{"type":"text","loc":{"start":{"line":8,"column":33},"filename":"/cases/mixin.attrs.pug","end":{"line":8,"column":37}},"val":"Back"}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":10,"column":18}},"val":"main","args":"title"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":11,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":11,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":11,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":11,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":11,"column":14}},"val":"stretch"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":12,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":21}},"val":"centered","args":"title"}
+{"type":"class","loc":{"start":{"line":12,"column":21},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":31}},"val":"highlight"}
+{"type":"&attributes","loc":{"start":{"line":12,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":12,"column":54}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":13,"column":7}},"val":6}
+{"type":"mixin-block","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":13,"column":12}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":15,"column":13}},"val":"bottom","args":null}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":16,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":13}},"val":"bottom"}
+{"type":"&attributes","loc":{"start":{"line":16,"column":13},"filename":"/cases/mixin.attrs.pug","end":{"line":16,"column":36}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":17,"column":5}},"val":4}
+{"type":"mixin-block","loc":{"start":{"line":17,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":17,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":19,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":19,"column":1}}}
+{"type":"tag","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":19,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":20,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":20,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":12}},"val":"centered","args":null}
+{"type":"id","loc":{"start":{"line":20,"column":12},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":18}},"val":"First"}
+{"type":"text","loc":{"start":{"line":20,"column":19},"filename":"/cases/mixin.attrs.pug","end":{"line":20,"column":30}},"val":"Hello World"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":21,"column":3}}}
+{"type":"call","loc":{"start":{"line":21,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":21,"column":25}},"val":"centered","args":"'Section 1'"}
+{"type":"id","loc":{"start":{"line":21,"column":25},"filename":"/cases/mixin.attrs.pug","end":{"line":21,"column":32}},"val":"Second"}
+{"type":"indent","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":22,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":22,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":22,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":22,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":22,"column":30}},"val":"Some important content."}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":3}}}
+{"type":"call","loc":{"start":{"line":23,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":25}},"val":"centered","args":"'Section 2'"}
+{"type":"id","loc":{"start":{"line":23,"column":25},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":31}},"val":"Third"}
+{"type":"class","loc":{"start":{"line":23,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":35}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":23,"column":35},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":36}}}
+{"type":"attribute","loc":{"start":{"line":23,"column":36},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":52}},"name":"href","mustEscape":true,"val":"'menu.html'"}
+{"type":"attribute","loc":{"start":{"line":23,"column":54},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":65}},"name":"class","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":23,"column":65},"filename":"/cases/mixin.attrs.pug","end":{"line":23,"column":66}}}
+{"type":"indent","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":24,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":24,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":24,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":24,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":24,"column":35}},"val":"Even more important content."}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":3}}}
+{"type":"call","loc":{"start":{"line":25,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":21}},"val":"main","args":"'Section 3'"}
+{"type":"start-attributes","loc":{"start":{"line":25,"column":21},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":25,"column":22},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":30}},"name":"href","mustEscape":true,"val":"'#'"}
+{"type":"end-attributes","loc":{"start":{"line":25,"column":30},"filename":"/cases/mixin.attrs.pug","end":{"line":25,"column":31}}}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":26,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":26,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":26,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":26,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":26,"column":20}},"val":"Last content."}
+{"type":"outdent","loc":{"start":{"line":27,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":3}}}
+{"type":"call","loc":{"start":{"line":27,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":10}},"val":"bottom","args":null}
+{"type":"class","loc":{"start":{"line":27,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":14}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":27,"column":14},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":15}}}
+{"type":"attribute","loc":{"start":{"line":27,"column":15},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":26}},"name":"class","mustEscape":true,"val":"'bar'"}
+{"type":"attribute","loc":{"start":{"line":27,"column":28},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":38}},"name":"name","mustEscape":true,"val":"'end'"}
+{"type":"attribute","loc":{"start":{"line":27,"column":40},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":49}},"name":"id","mustEscape":true,"val":"'Last'"}
+{"type":"attribute","loc":{"start":{"line":27,"column":51},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":66}},"name":"data-attr","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":27,"column":66},"filename":"/cases/mixin.attrs.pug","end":{"line":27,"column":67}}}
+{"type":"indent","loc":{"start":{"line":28,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":28,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":28,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":28,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":28,"column":7},"filename":"/cases/mixin.attrs.pug","end":{"line":28,"column":24}},"val":"Some final words."}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":3}}}
+{"type":"call","loc":{"start":{"line":29,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":10}},"val":"bottom","args":null}
+{"type":"start-attributes","loc":{"start":{"line":29,"column":10},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":29,"column":11},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":37}},"name":"class","mustEscape":true,"val":"['class1', 'class2']"}
+{"type":"end-attributes","loc":{"start":{"line":29,"column":37},"filename":"/cases/mixin.attrs.pug","end":{"line":29,"column":38}}}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":31,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":31,"column":10}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":32,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":6}},"val":"div"}
+{"type":"class","loc":{"start":{"line":32,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":12}},"val":"thing"}
+{"type":"start-attributes","loc":{"start":{"line":32,"column":12},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":32,"column":13},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":24}},"name":"attr1","mustEscape":true,"val":"'foo'"}
+{"type":"attribute","loc":{"start":{"line":32,"column":26},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":37}},"name":"attr2","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":32,"column":37},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":38}}}
+{"type":"&attributes","loc":{"start":{"line":32,"column":38},"filename":"/cases/mixin.attrs.pug","end":{"line":32,"column":61}},"val":"attributes"}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":34,"column":1}}}
+{"type":"code","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":34,"column":20}},"val":"var val = '<biz>'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":35,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":35,"column":1}}}
+{"type":"code","loc":{"start":{"line":35,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":35,"column":31}},"val":"var classes = ['foo', 'bar']","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":36,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":1}}}
+{"type":"call","loc":{"start":{"line":36,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":5}},"val":"foo","args":null}
+{"type":"start-attributes","loc":{"start":{"line":36,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":36,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":17}},"name":"attr3","mustEscape":true,"val":"'baz'"}
+{"type":"attribute","loc":{"start":{"line":36,"column":18},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":30}},"name":"data-foo","mustEscape":true,"val":"val"}
+{"type":"attribute","loc":{"start":{"line":36,"column":31},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":44}},"name":"data-bar","mustEscape":false,"val":"val"}
+{"type":"attribute","loc":{"start":{"line":36,"column":45},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":58}},"name":"class","mustEscape":true,"val":"classes"}
+{"type":"end-attributes","loc":{"start":{"line":36,"column":58},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":59}}}
+{"type":"class","loc":{"start":{"line":36,"column":59},"filename":"/cases/mixin.attrs.pug","end":{"line":36,"column":65}},"val":"thunk"}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":38,"column":1}}}
+{"type":"comment","loc":{"start":{"line":38,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":38,"column":30}},"val":" Regression test for #1424","buffer":false}
+{"type":"newline","loc":{"start":{"line":39,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":39,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":39,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":39,"column":32}},"val":"work_filmstrip_item","args":"work"}
+{"type":"indent","loc":{"start":{"line":40,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":40,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":6}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":40,"column":6},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":29}},"val":"attributes"}
+{"type":"code","loc":{"start":{"line":40,"column":29},"filename":"/cases/mixin.attrs.pug","end":{"line":40,"column":35}},"val":"work","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":41,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":1}}}
+{"type":"call","loc":{"start":{"line":41,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":29}},"val":"work_filmstrip_item","args":"'work'"}
+{"type":"start-attributes","loc":{"start":{"line":41,"column":29},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":30}}}
+{"type":"attribute","loc":{"start":{"line":41,"column":30},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":54}},"name":"data-profile","mustEscape":true,"val":"'profile'"}
+{"type":"attribute","loc":{"start":{"line":41,"column":56},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":82}},"name":"data-creator-name","mustEscape":true,"val":"'name'"}
+{"type":"end-attributes","loc":{"start":{"line":41,"column":82},"filename":"/cases/mixin.attrs.pug","end":{"line":41,"column":83}}}
+{"type":"newline","loc":{"start":{"line":43,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":43,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":43,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":43,"column":39}},"val":"my-mixin","args":"arg1, arg2, arg3, arg4"}
+{"type":"indent","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":44,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":44,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":44,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":44,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":44,"column":10}},"val":"arg1","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":45,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":45,"column":3}}}
+{"type":"tag","loc":{"start":{"line":45,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":45,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":45,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":45,"column":10}},"val":"arg2","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":46,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":46,"column":3}}}
+{"type":"tag","loc":{"start":{"line":46,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":46,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":46,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":46,"column":10}},"val":"arg3","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":47,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":47,"column":3}}}
+{"type":"tag","loc":{"start":{"line":47,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":47,"column":4}},"val":"p"}
+{"type":"code","loc":{"start":{"line":47,"column":4},"filename":"/cases/mixin.attrs.pug","end":{"line":47,"column":10}},"val":"arg4","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":49,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":49,"column":1}}}
+{"type":"call","loc":{"start":{"line":49,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":49,"column":5}},"val":"foo","args":null}
+{"type":"start-attributes","loc":{"start":{"line":49,"column":5},"filename":"/cases/mixin.attrs.pug","end":{"line":49,"column":6}}}
+{"type":"attribute","loc":{"start":{"line":50,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":50,"column":14}},"name":"attr3","mustEscape":true,"val":"\"qux\""}
+{"type":"attribute","loc":{"start":{"line":51,"column":3},"filename":"/cases/mixin.attrs.pug","end":{"line":51,"column":14}},"name":"class","mustEscape":true,"val":"\"baz\""}
+{"type":"end-attributes","loc":{"start":{"line":52,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":52,"column":2}}}
+{"type":"newline","loc":{"start":{"line":54,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":54,"column":1}}}
+{"type":"call","loc":{"start":{"line":54,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":59,"column":2}},"val":"my-mixin","args":"\n'1',\n      '2',\n  '3',\n      '4'\n"}
+{"type":"newline","loc":{"start":{"line":60,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":60,"column":1}}}
+{"type":"eos","loc":{"start":{"line":60,"column":1},"filename":"/cases/mixin.attrs.pug","end":{"line":60,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json b/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json
index 97fc55f13..a59e52ad7 100644
--- a/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.block-tag-behaviour.tokens.json
@@ -1,56 +1,56 @@
-{"type":"newline","line":2,"col":1}
-{"type":"mixin","line":2,"col":1,"val":"article","args":"name"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"section"}
-{"type":"class","line":3,"col":10,"val":"article"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"h1"}
-{"type":"code","line":4,"col":7,"val":"name","mustEscape":true,"buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"mixin-block","line":5,"col":5}
-{"type":"outdent","line":7,"col":3}
-{"type":"outdent","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"html"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"tag","line":8,"col":3,"val":"body"}
-{"type":"indent","line":9,"col":1,"val":4}
-{"type":"call","line":9,"col":5,"val":"article","args":"'Foo'"}
-{"type":":","line":9,"col":20}
-{"type":"tag","line":9,"col":22,"val":"p"}
-{"type":"text","line":9,"col":24,"val":"I'm article foo"}
-{"type":"outdent","line":11,"col":3}
-{"type":"outdent","line":11,"col":1}
-{"type":"mixin","line":11,"col":1,"val":"article","args":"name"}
-{"type":"indent","line":12,"col":1,"val":2}
-{"type":"tag","line":12,"col":3,"val":"section"}
-{"type":"class","line":12,"col":10,"val":"article"}
-{"type":"indent","line":13,"col":1,"val":4}
-{"type":"tag","line":13,"col":5,"val":"h1"}
-{"type":"code","line":13,"col":7,"val":"name","mustEscape":true,"buffer":true}
-{"type":"newline","line":14,"col":1}
-{"type":"tag","line":14,"col":5,"val":"p"}
-{"type":"indent","line":15,"col":1,"val":6}
-{"type":"mixin-block","line":15,"col":7}
-{"type":"outdent","line":17,"col":5}
-{"type":"outdent","line":17,"col":3}
-{"type":"outdent","line":17,"col":1}
-{"type":"tag","line":17,"col":1,"val":"html"}
-{"type":"indent","line":18,"col":1,"val":2}
-{"type":"tag","line":18,"col":3,"val":"body"}
-{"type":"indent","line":19,"col":1,"val":4}
-{"type":"call","line":19,"col":5,"val":"article","args":"'Something'"}
-{"type":"dot","line":19,"col":26}
-{"type":"start-pipeless-text","line":19,"col":27}
-{"type":"text","line":20,"col":7,"val":"I'm a much longer"}
-{"type":"newline","line":21,"col":1}
-{"type":"text","line":21,"col":7,"val":"text-only article,"}
-{"type":"newline","line":22,"col":1}
-{"type":"text","line":22,"col":7,"val":"but you can still"}
-{"type":"newline","line":23,"col":1}
-{"type":"text","line":23,"col":7,"val":"inline html tags"}
-{"type":"newline","line":24,"col":1}
-{"type":"text","line":24,"col":7,"val":"in me if you want."}
-{"type":"end-pipeless-text","line":24,"col":25}
-{"type":"outdent","line":24,"col":25}
-{"type":"outdent","line":24,"col":25}
-{"type":"eos","line":24,"col":25}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":2,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":2,"column":20}},"val":"article","args":"name"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":3,"column":10}},"val":"section"}
+{"type":"class","loc":{"start":{"line":3,"column":10},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":3,"column":18}},"val":"article"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":4,"column":7}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":4,"column":13}},"val":"name","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":5,"column":5}}}
+{"type":"mixin-block","loc":{"start":{"line":5,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":5,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":7,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":8,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":9,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":20}},"val":"article","args":"'Foo'"}
+{"type":":","loc":{"start":{"line":9,"column":20},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":22}}}
+{"type":"tag","loc":{"start":{"line":9,"column":22},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":23}},"val":"p"}
+{"type":"text","loc":{"start":{"line":9,"column":24},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":9,"column":39}},"val":"I'm article foo"}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":11,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":11,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":11,"column":20}},"val":"article","args":"name"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":12,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":12,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":12,"column":10}},"val":"section"}
+{"type":"class","loc":{"start":{"line":12,"column":10},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":12,"column":18}},"val":"article"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":13,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":13,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":13,"column":7}},"val":"h1"}
+{"type":"code","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":13,"column":13}},"val":"name","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":14,"column":5}}}
+{"type":"tag","loc":{"start":{"line":14,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":14,"column":6}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":15,"column":7}},"val":6}
+{"type":"mixin-block","loc":{"start":{"line":15,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":15,"column":12}}}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":1}}}
+{"type":"tag","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":17,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":18,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":18,"column":3},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":18,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":19,"column":5},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":26}},"val":"article","args":"'Something'"}
+{"type":"dot","loc":{"start":{"line":19,"column":26},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":27}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":19,"column":27},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":19,"column":27}}}
+{"type":"text","loc":{"start":{"line":20,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":20,"column":24}},"val":"I'm a much longer"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":21,"column":7}}}
+{"type":"text","loc":{"start":{"line":21,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":21,"column":25}},"val":"text-only article,"}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":22,"column":7}}}
+{"type":"text","loc":{"start":{"line":22,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":22,"column":24}},"val":"but you can still"}
+{"type":"newline","loc":{"start":{"line":23,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":23,"column":7}}}
+{"type":"text","loc":{"start":{"line":23,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":23,"column":23}},"val":"inline html tags"}
+{"type":"newline","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":7}}}
+{"type":"text","loc":{"start":{"line":24,"column":7},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}},"val":"in me if you want."}
+{"type":"end-pipeless-text","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
+{"type":"outdent","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
+{"type":"eos","loc":{"start":{"line":24,"column":25},"filename":"/cases/mixin.block-tag-behaviour.pug","end":{"line":24,"column":25}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.blocks.tokens.json b/packages/pug-parser/test/cases/mixin.blocks.tokens.json
index ddf60bcd7..7fc8a0cd3 100644
--- a/packages/pug-parser/test/cases/mixin.blocks.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.blocks.tokens.json
@@ -1,108 +1,108 @@
-{"type":"newline","line":3,"col":1}
-{"type":"mixin","line":3,"col":1,"val":"form","args":"method, action"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"tag","line":4,"col":3,"val":"form"}
-{"type":"start-attributes","line":4,"col":7}
-{"type":"attribute","line":4,"col":8,"name":"method","val":"method","mustEscape":true}
-{"type":"attribute","line":4,"col":23,"name":"action","val":"action","mustEscape":true}
-{"type":"end-attributes","line":4,"col":36}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"code","line":5,"col":5,"val":"var csrf_token_from_somewhere = 'hey'","mustEscape":false,"buffer":false}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":5,"val":"input"}
-{"type":"start-attributes","line":6,"col":10}
-{"type":"attribute","line":6,"col":11,"name":"type","val":"'hidden'","mustEscape":true}
-{"type":"attribute","line":6,"col":26,"name":"name","val":"'_csrf'","mustEscape":true}
-{"type":"attribute","line":6,"col":40,"name":"value","val":"csrf_token_from_somewhere","mustEscape":true}
-{"type":"end-attributes","line":6,"col":71}
-{"type":"newline","line":7,"col":1}
-{"type":"mixin-block","line":7,"col":5}
-{"type":"outdent","line":9,"col":3}
-{"type":"outdent","line":9,"col":1}
-{"type":"tag","line":9,"col":1,"val":"html"}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"tag","line":10,"col":3,"val":"body"}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"call","line":11,"col":5,"val":"form","args":"'GET', '/search'"}
-{"type":"indent","line":12,"col":1,"val":6}
-{"type":"tag","line":12,"col":7,"val":"input"}
-{"type":"start-attributes","line":12,"col":12}
-{"type":"attribute","line":12,"col":13,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":12,"col":26,"name":"name","val":"'query'","mustEscape":true}
-{"type":"attribute","line":12,"col":40,"name":"placeholder","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":12,"col":60}
-{"type":"newline","line":13,"col":1}
-{"type":"tag","line":13,"col":7,"val":"input"}
-{"type":"start-attributes","line":13,"col":12}
-{"type":"attribute","line":13,"col":13,"name":"type","val":"'submit'","mustEscape":true}
-{"type":"attribute","line":13,"col":28,"name":"value","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":13,"col":42}
-{"type":"outdent","line":15,"col":5}
-{"type":"outdent","line":15,"col":3}
-{"type":"outdent","line":15,"col":1}
-{"type":"tag","line":15,"col":1,"val":"html"}
-{"type":"indent","line":16,"col":1,"val":2}
-{"type":"tag","line":16,"col":3,"val":"body"}
-{"type":"indent","line":17,"col":1,"val":4}
-{"type":"call","line":17,"col":5,"val":"form","args":"'POST', '/search'"}
-{"type":"indent","line":18,"col":1,"val":6}
-{"type":"tag","line":18,"col":7,"val":"input"}
-{"type":"start-attributes","line":18,"col":12}
-{"type":"attribute","line":18,"col":13,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":18,"col":26,"name":"name","val":"'query'","mustEscape":true}
-{"type":"attribute","line":18,"col":40,"name":"placeholder","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":18,"col":60}
-{"type":"newline","line":19,"col":1}
-{"type":"tag","line":19,"col":7,"val":"input"}
-{"type":"start-attributes","line":19,"col":12}
-{"type":"attribute","line":19,"col":13,"name":"type","val":"'submit'","mustEscape":true}
-{"type":"attribute","line":19,"col":28,"name":"value","val":"'Search'","mustEscape":true}
-{"type":"end-attributes","line":19,"col":42}
-{"type":"outdent","line":21,"col":5}
-{"type":"outdent","line":21,"col":3}
-{"type":"outdent","line":21,"col":1}
-{"type":"tag","line":21,"col":1,"val":"html"}
-{"type":"indent","line":22,"col":1,"val":2}
-{"type":"tag","line":22,"col":3,"val":"body"}
-{"type":"indent","line":23,"col":1,"val":4}
-{"type":"call","line":23,"col":5,"val":"form","args":"'POST', '/search'"}
-{"type":"outdent","line":25,"col":3}
-{"type":"outdent","line":25,"col":1}
-{"type":"mixin","line":25,"col":1,"val":"bar","args":null}
-{"type":"indent","line":26,"col":1,"val":2}
-{"type":"id","line":26,"col":3,"val":"bar"}
-{"type":"indent","line":27,"col":1,"val":4}
-{"type":"mixin-block","line":27,"col":5}
-{"type":"outdent","line":29,"col":3}
-{"type":"outdent","line":29,"col":1}
-{"type":"mixin","line":29,"col":1,"val":"foo","args":null}
-{"type":"indent","line":30,"col":1,"val":2}
-{"type":"id","line":30,"col":3,"val":"foo"}
-{"type":"indent","line":31,"col":1,"val":4}
-{"type":"call","line":31,"col":5,"val":"bar","args":null}
-{"type":"indent","line":32,"col":1,"val":6}
-{"type":"mixin-block","line":32,"col":7}
-{"type":"outdent","line":34,"col":5}
-{"type":"outdent","line":34,"col":3}
-{"type":"outdent","line":34,"col":1}
-{"type":"call","line":34,"col":1,"val":"foo","args":null}
-{"type":"indent","line":35,"col":1,"val":2}
-{"type":"tag","line":35,"col":3,"val":"p"}
-{"type":"text","line":35,"col":5,"val":"one"}
-{"type":"newline","line":36,"col":1}
-{"type":"tag","line":36,"col":3,"val":"p"}
-{"type":"text","line":36,"col":5,"val":"two"}
-{"type":"newline","line":37,"col":1}
-{"type":"tag","line":37,"col":3,"val":"p"}
-{"type":"text","line":37,"col":5,"val":"three"}
-{"type":"outdent","line":40,"col":1}
-{"type":"mixin","line":40,"col":1,"val":"baz","args":null}
-{"type":"indent","line":41,"col":1,"val":4}
-{"type":"id","line":41,"col":5,"val":"baz"}
-{"type":"indent","line":42,"col":1,"val":8}
-{"type":"mixin-block","line":42,"col":9}
-{"type":"outdent","line":44,"col":5}
-{"type":"outdent","line":44,"col":1}
-{"type":"call","line":44,"col":1,"val":"baz","args":""}
-{"type":"code","line":44,"col":7,"val":"'123'","mustEscape":true,"buffer":true}
-{"type":"eos","line":44,"col":14}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":3,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":3,"column":27}},"val":"form","args":"method, action"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":7}},"val":"form"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":8},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":21}},"name":"method","mustEscape":true,"val":"method"}
+{"type":"attribute","loc":{"start":{"line":4,"column":23},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":36}},"name":"action","mustEscape":true,"val":"action"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":36},"filename":"/cases/mixin.blocks.pug","end":{"line":4,"column":37}}}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":5,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":5,"column":44}},"val":"var csrf_token_from_somewhere = 'hey'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":5}}}
+{"type":"tag","loc":{"start":{"line":6,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":10}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":10},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":11}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":11},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":24}},"name":"type","mustEscape":true,"val":"'hidden'"}
+{"type":"attribute","loc":{"start":{"line":6,"column":26},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":38}},"name":"name","mustEscape":true,"val":"'_csrf'"}
+{"type":"attribute","loc":{"start":{"line":6,"column":40},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":71}},"name":"value","mustEscape":true,"val":"csrf_token_from_somewhere"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":71},"filename":"/cases/mixin.blocks.pug","end":{"line":6,"column":72}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":7,"column":5}}}
+{"type":"mixin-block","loc":{"start":{"line":7,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":7,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":9,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":9,"column":1}}}
+{"type":"tag","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":9,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":10,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":10,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":11,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":11,"column":28}},"val":"form","args":"'GET', '/search'"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":12,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":24}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":12,"column":26},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":38}},"name":"name","mustEscape":true,"val":"'query'"}
+{"type":"attribute","loc":{"start":{"line":12,"column":40},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":60}},"name":"placeholder","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":60},"filename":"/cases/mixin.blocks.pug","end":{"line":12,"column":61}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":7}}}
+{"type":"tag","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":26}},"name":"type","mustEscape":true,"val":"'submit'"}
+{"type":"attribute","loc":{"start":{"line":13,"column":28},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":42}},"name":"value","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":42},"filename":"/cases/mixin.blocks.pug","end":{"line":13,"column":43}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":1}}}
+{"type":"tag","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":15,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":16,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":16,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":17,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":17,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":17,"column":29}},"val":"form","args":"'POST', '/search'"}
+{"type":"indent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":18,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":18,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":18,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":24}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":18,"column":26},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":38}},"name":"name","mustEscape":true,"val":"'query'"}
+{"type":"attribute","loc":{"start":{"line":18,"column":40},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":60}},"name":"placeholder","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":18,"column":60},"filename":"/cases/mixin.blocks.pug","end":{"line":18,"column":61}}}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":7}}}
+{"type":"tag","loc":{"start":{"line":19,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":12}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":12},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":13}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":13},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":26}},"name":"type","mustEscape":true,"val":"'submit'"}
+{"type":"attribute","loc":{"start":{"line":19,"column":28},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":42}},"name":"value","mustEscape":true,"val":"'Search'"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":42},"filename":"/cases/mixin.blocks.pug","end":{"line":19,"column":43}}}
+{"type":"outdent","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":1}}}
+{"type":"tag","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":21,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":22,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":22,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":22,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":23,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":23,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":23,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":23,"column":29}},"val":"form","args":"'POST', '/search'"}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":25,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":25,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":25,"column":12}},"val":"bar","args":null}
+{"type":"indent","loc":{"start":{"line":26,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":26,"column":3}},"val":2}
+{"type":"id","loc":{"start":{"line":26,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":26,"column":7}},"val":"bar"}
+{"type":"indent","loc":{"start":{"line":27,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":27,"column":5}},"val":4}
+{"type":"mixin-block","loc":{"start":{"line":27,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":27,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":29,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":29,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":29,"column":12}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":30,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":30,"column":3}},"val":2}
+{"type":"id","loc":{"start":{"line":30,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":30,"column":7}},"val":"foo"}
+{"type":"indent","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":31,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":31,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":31,"column":9}},"val":"bar","args":null}
+{"type":"indent","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":32,"column":7}},"val":6}
+{"type":"mixin-block","loc":{"start":{"line":32,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":32,"column":12}}}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":1}}}
+{"type":"call","loc":{"start":{"line":34,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":34,"column":5}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":35,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":35,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":35,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":35,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":35,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":35,"column":8}},"val":"one"}
+{"type":"newline","loc":{"start":{"line":36,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":36,"column":3}}}
+{"type":"tag","loc":{"start":{"line":36,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":36,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":36,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":36,"column":8}},"val":"two"}
+{"type":"newline","loc":{"start":{"line":37,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":37,"column":3}}}
+{"type":"tag","loc":{"start":{"line":37,"column":3},"filename":"/cases/mixin.blocks.pug","end":{"line":37,"column":4}},"val":"p"}
+{"type":"text","loc":{"start":{"line":37,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":37,"column":10}},"val":"three"}
+{"type":"outdent","loc":{"start":{"line":40,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":40,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":40,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":40,"column":10}},"val":"baz","args":null}
+{"type":"indent","loc":{"start":{"line":41,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":41,"column":5}},"val":4}
+{"type":"id","loc":{"start":{"line":41,"column":5},"filename":"/cases/mixin.blocks.pug","end":{"line":41,"column":9}},"val":"baz"}
+{"type":"indent","loc":{"start":{"line":42,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":42,"column":9}},"val":8}
+{"type":"mixin-block","loc":{"start":{"line":42,"column":9},"filename":"/cases/mixin.blocks.pug","end":{"line":42,"column":14}}}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":1}}}
+{"type":"call","loc":{"start":{"line":44,"column":1},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":7}},"val":"baz","args":""}
+{"type":"code","loc":{"start":{"line":44,"column":7},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":14}},"val":"'123'","mustEscape":true,"buffer":true}
+{"type":"eos","loc":{"start":{"line":44,"column":14},"filename":"/cases/mixin.blocks.pug","end":{"line":44,"column":14}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixin.merge.tokens.json b/packages/pug-parser/test/cases/mixin.merge.tokens.json
index 3e4dbf18b..97d8d55e0 100644
--- a/packages/pug-parser/test/cases/mixin.merge.tokens.json
+++ b/packages/pug-parser/test/cases/mixin.merge.tokens.json
@@ -1,58 +1,58 @@
-{"type":"mixin","line":1,"col":1,"val":"foo","args":null}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"p"}
-{"type":"class","line":2,"col":4,"val":"bar"}
-{"type":"&attributes","line":2,"col":8,"val":"attributes"}
-{"type":"text","line":2,"col":32,"val":"One"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":3,"val":"p"}
-{"type":"class","line":3,"col":4,"val":"baz"}
-{"type":"class","line":3,"col":8,"val":"quux"}
-{"type":"&attributes","line":3,"col":13,"val":"attributes"}
-{"type":"text","line":3,"col":37,"val":"Two"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"p"}
-{"type":"&attributes","line":4,"col":4,"val":"attributes"}
-{"type":"text","line":4,"col":28,"val":"Three"}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"p"}
-{"type":"class","line":5,"col":4,"val":"bar"}
-{"type":"&attributes","line":5,"col":8,"val":"attributes"}
-{"type":"start-attributes","line":5,"col":31}
-{"type":"attribute","line":5,"col":32,"name":"class","val":"\"baz\"","mustEscape":true}
-{"type":"end-attributes","line":5,"col":43}
-{"type":"text","line":5,"col":45,"val":"Four"}
-{"type":"outdent","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"body"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"call","line":8,"col":3,"val":"foo","args":null}
-{"type":"class","line":8,"col":7,"val":"hello"}
-{"type":"newline","line":9,"col":1}
-{"type":"call","line":9,"col":3,"val":"foo","args":null}
-{"type":"id","line":9,"col":7,"val":"world"}
-{"type":"newline","line":10,"col":1}
-{"type":"call","line":10,"col":3,"val":"foo","args":null}
-{"type":"class","line":10,"col":7,"val":"hello"}
-{"type":"id","line":10,"col":13,"val":"world"}
-{"type":"newline","line":11,"col":1}
-{"type":"call","line":11,"col":3,"val":"foo","args":null}
-{"type":"class","line":11,"col":7,"val":"hello"}
-{"type":"class","line":11,"col":13,"val":"world"}
-{"type":"newline","line":12,"col":1}
-{"type":"call","line":12,"col":3,"val":"foo","args":null}
-{"type":"start-attributes","line":12,"col":7}
-{"type":"attribute","line":12,"col":8,"name":"class","val":"\"hello\"","mustEscape":true}
-{"type":"end-attributes","line":12,"col":21}
-{"type":"newline","line":13,"col":1}
-{"type":"call","line":13,"col":3,"val":"foo","args":null}
-{"type":"class","line":13,"col":7,"val":"hello"}
-{"type":"start-attributes","line":13,"col":13}
-{"type":"attribute","line":13,"col":14,"name":"class","val":"\"world\"","mustEscape":true}
-{"type":"end-attributes","line":13,"col":27}
-{"type":"newline","line":14,"col":1}
-{"type":"call","line":14,"col":3,"val":"foo","args":null}
-{"type":"newline","line":15,"col":1}
-{"type":"call","line":15,"col":3,"val":"foo","args":null}
-{"type":"&attributes","line":15,"col":7,"val":"{class: \"hello\"}"}
-{"type":"outdent","line":15,"col":36}
-{"type":"eos","line":15,"col":36}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":1,"column":10}},"val":"foo","args":null}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":4}},"val":"p"}
+{"type":"class","loc":{"start":{"line":2,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":8}},"val":"bar"}
+{"type":"&attributes","loc":{"start":{"line":2,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":31}},"val":"attributes"}
+{"type":"text","loc":{"start":{"line":2,"column":32},"filename":"/cases/mixin.merge.pug","end":{"line":2,"column":35}},"val":"One"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":3}}}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":4}},"val":"p"}
+{"type":"class","loc":{"start":{"line":3,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":8}},"val":"baz"}
+{"type":"class","loc":{"start":{"line":3,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":13}},"val":"quux"}
+{"type":"&attributes","loc":{"start":{"line":3,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":36}},"val":"attributes"}
+{"type":"text","loc":{"start":{"line":3,"column":37},"filename":"/cases/mixin.merge.pug","end":{"line":3,"column":40}},"val":"Two"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":4}},"val":"p"}
+{"type":"&attributes","loc":{"start":{"line":4,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":27}},"val":"attributes"}
+{"type":"text","loc":{"start":{"line":4,"column":28},"filename":"/cases/mixin.merge.pug","end":{"line":4,"column":33}},"val":"Three"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":4}},"val":"p"}
+{"type":"class","loc":{"start":{"line":5,"column":4},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":8}},"val":"bar"}
+{"type":"&attributes","loc":{"start":{"line":5,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":31}},"val":"attributes"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":31},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":32}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":32},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":43}},"name":"class","mustEscape":true,"val":"\"baz\""}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":43},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":44}}}
+{"type":"text","loc":{"start":{"line":5,"column":45},"filename":"/cases/mixin.merge.pug","end":{"line":5,"column":49}},"val":"Four"}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":7,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":8,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":8,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":8,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":8,"column":13}},"val":"hello"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":9,"column":3}}}
+{"type":"call","loc":{"start":{"line":9,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":9,"column":7}},"val":"foo","args":null}
+{"type":"id","loc":{"start":{"line":9,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":9,"column":13}},"val":"world"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":3}}}
+{"type":"call","loc":{"start":{"line":10,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":10,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":13}},"val":"hello"}
+{"type":"id","loc":{"start":{"line":10,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":10,"column":19}},"val":"world"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":3}}}
+{"type":"call","loc":{"start":{"line":11,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":11,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":13}},"val":"hello"}
+{"type":"class","loc":{"start":{"line":11,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":11,"column":19}},"val":"world"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":3}}}
+{"type":"call","loc":{"start":{"line":12,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":7}},"val":"foo","args":null}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":8},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":21}},"name":"class","mustEscape":true,"val":"\"hello\""}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":21},"filename":"/cases/mixin.merge.pug","end":{"line":12,"column":22}}}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":3}}}
+{"type":"call","loc":{"start":{"line":13,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":7}},"val":"foo","args":null}
+{"type":"class","loc":{"start":{"line":13,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":13}},"val":"hello"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":13},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":14},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":27}},"name":"class","mustEscape":true,"val":"\"world\""}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":27},"filename":"/cases/mixin.merge.pug","end":{"line":13,"column":28}}}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":14,"column":3}}}
+{"type":"call","loc":{"start":{"line":14,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":14,"column":7}},"val":"foo","args":null}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":3}}}
+{"type":"call","loc":{"start":{"line":15,"column":3},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":7}},"val":"foo","args":null}
+{"type":"&attributes","loc":{"start":{"line":15,"column":7},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":36}},"val":"{class: \"hello\"}"}
+{"type":"outdent","loc":{"start":{"line":15,"column":36},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":36}}}
+{"type":"eos","loc":{"start":{"line":15,"column":36},"filename":"/cases/mixin.merge.pug","end":{"line":15,"column":36}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixins-unused.tokens.json b/packages/pug-parser/test/cases/mixins-unused.tokens.json
index 384f1ffd9..edba36a54 100644
--- a/packages/pug-parser/test/cases/mixins-unused.tokens.json
+++ b/packages/pug-parser/test/cases/mixins-unused.tokens.json
@@ -1,7 +1,7 @@
-{"type":"mixin","line":1,"col":1,"val":"never-called","args":null}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"class","line":2,"col":3,"val":"wtf"}
-{"type":"text","line":2,"col":8,"val":"This isn't something we ever want to output"}
-{"type":"outdent","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"body"}
-{"type":"eos","line":3,"col":5}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":1,"column":19}},"val":"never-called","args":null}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixins-unused.pug","end":{"line":2,"column":7}},"val":"wtf"}
+{"type":"text","loc":{"start":{"line":2,"column":8},"filename":"/cases/mixins-unused.pug","end":{"line":2,"column":51}},"val":"This isn't something we ever want to output"}
+{"type":"outdent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins-unused.pug","end":{"line":3,"column":5}},"val":"body"}
+{"type":"eos","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixins-unused.pug","end":{"line":3,"column":5}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixins.rest-args.tokens.json b/packages/pug-parser/test/cases/mixins.rest-args.tokens.json
index 9f1a88641..36f67157c 100644
--- a/packages/pug-parser/test/cases/mixins.rest-args.tokens.json
+++ b/packages/pug-parser/test/cases/mixins.rest-args.tokens.json
@@ -1,14 +1,14 @@
-{"type":"mixin","line":1,"col":1,"val":"list","args":"tag, ...items"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"interpolation","line":2,"col":3,"val":"tag"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"each","line":3,"col":5,"val":"item","key":null,"code":"items"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"li"}
-{"type":"code","line":4,"col":9,"val":"item","mustEscape":true,"buffer":true}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"call","line":6,"col":1,"val":"list","args":"'ul', 1, 2, 3, 4"}
-{"type":"newline","line":7,"col":1}
-{"type":"eos","line":7,"col":1}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":1,"column":26}},"val":"list","args":"tag, ...items"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"interpolation","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixins.rest-args.pug","end":{"line":2,"column":9}},"val":"tag"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"each","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixins.rest-args.pug","end":{"line":3,"column":23}},"val":"item","key":null,"code":"items"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/mixins.rest-args.pug","end":{"line":4,"column":9}},"val":"li"}
+{"type":"code","loc":{"start":{"line":4,"column":9},"filename":"/cases/mixins.rest-args.pug","end":{"line":4,"column":15}},"val":"item","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":1}}}
+{"type":"call","loc":{"start":{"line":6,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":6,"column":24}},"val":"list","args":"'ul', 1, 2, 3, 4"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":7,"column":1}}}
+{"type":"eos","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.rest-args.pug","end":{"line":7,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/mixins.tokens.json b/packages/pug-parser/test/cases/mixins.tokens.json
index 34716d7cb..71dfaf8e9 100644
--- a/packages/pug-parser/test/cases/mixins.tokens.json
+++ b/packages/pug-parser/test/cases/mixins.tokens.json
@@ -1,65 +1,65 @@
-{"type":"mixin","line":1,"col":1,"val":"comment","args":"title, str"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"class","line":2,"col":3,"val":"comment"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h2"}
-{"type":"code","line":3,"col":7,"val":"title","mustEscape":true,"buffer":true}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"p"}
-{"type":"class","line":4,"col":6,"val":"body"}
-{"type":"code","line":4,"col":11,"val":"str","mustEscape":true,"buffer":true}
-{"type":"outdent","line":7,"col":3}
-{"type":"outdent","line":7,"col":1}
-{"type":"mixin","line":7,"col":1,"val":"comment","args":"title, str"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"class","line":8,"col":3,"val":"comment"}
-{"type":"indent","line":9,"col":1,"val":4}
-{"type":"tag","line":9,"col":5,"val":"h2"}
-{"type":"code","line":9,"col":7,"val":"title","mustEscape":true,"buffer":true}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":5,"val":"p"}
-{"type":"class","line":10,"col":6,"val":"body"}
-{"type":"code","line":10,"col":11,"val":"str","mustEscape":true,"buffer":true}
-{"type":"outdent","line":12,"col":3}
-{"type":"outdent","line":12,"col":1}
-{"type":"id","line":12,"col":1,"val":"user"}
-{"type":"indent","line":13,"col":1,"val":2}
-{"type":"tag","line":13,"col":3,"val":"h1"}
-{"type":"text","line":13,"col":6,"val":"Tobi"}
-{"type":"newline","line":14,"col":1}
-{"type":"class","line":14,"col":3,"val":"comments"}
-{"type":"indent","line":15,"col":1,"val":4}
-{"type":"call","line":15,"col":5,"val":"comment","args":"'This',\n            (('is regular, javascript'))"}
-{"type":"outdent","line":18,"col":3}
-{"type":"outdent","line":18,"col":1}
-{"type":"mixin","line":18,"col":1,"val":"list","args":null}
-{"type":"indent","line":19,"col":1,"val":2}
-{"type":"tag","line":19,"col":3,"val":"ul"}
-{"type":"indent","line":20,"col":1,"val":4}
-{"type":"tag","line":20,"col":5,"val":"li"}
-{"type":"text","line":20,"col":8,"val":"foo"}
-{"type":"newline","line":21,"col":1}
-{"type":"tag","line":21,"col":5,"val":"li"}
-{"type":"text","line":21,"col":8,"val":"bar"}
-{"type":"newline","line":22,"col":1}
-{"type":"tag","line":22,"col":5,"val":"li"}
-{"type":"text","line":22,"col":8,"val":"baz"}
-{"type":"outdent","line":24,"col":3}
-{"type":"outdent","line":24,"col":1}
-{"type":"tag","line":24,"col":1,"val":"body"}
-{"type":"indent","line":25,"col":1,"val":2}
-{"type":"call","line":25,"col":3,"val":"list","args":""}
-{"type":"newline","line":26,"col":1}
-{"type":"call","line":26,"col":3,"val":"list","args":""}
-{"type":"outdent","line":28,"col":1}
-{"type":"mixin","line":28,"col":1,"val":"foobar","args":"str"}
-{"type":"indent","line":29,"col":1,"val":2}
-{"type":"tag","line":29,"col":3,"val":"div"}
-{"type":"id","line":29,"col":6,"val":"interpolation"}
-{"type":"code","line":29,"col":20,"val":"str + 'interpolated'","mustEscape":true,"buffer":true}
-{"type":"outdent","line":31,"col":1}
-{"type":"code","line":31,"col":1,"val":"var suffix = \"bar\"","mustEscape":false,"buffer":false}
-{"type":"newline","line":32,"col":1}
-{"type":"call","line":32,"col":1,"val":"#{'foo' + suffix}","args":"'This is '"}
-{"type":"newline","line":33,"col":1}
-{"type":"eos","line":33,"col":1}
\ No newline at end of file
+{"type":"mixin","loc":{"start":{"line":1,"column":1},"filename":"/cases/mixins.pug","end":{"line":1,"column":26}},"val":"comment","args":"title, str"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/mixins.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":2,"column":3},"filename":"/cases/mixins.pug","end":{"line":2,"column":11}},"val":"comment"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/mixins.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/mixins.pug","end":{"line":3,"column":7}},"val":"h2"}
+{"type":"code","loc":{"start":{"line":3,"column":7},"filename":"/cases/mixins.pug","end":{"line":3,"column":14}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/mixins.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/mixins.pug","end":{"line":4,"column":6}},"val":"p"}
+{"type":"class","loc":{"start":{"line":4,"column":6},"filename":"/cases/mixins.pug","end":{"line":4,"column":11}},"val":"body"}
+{"type":"code","loc":{"start":{"line":4,"column":11},"filename":"/cases/mixins.pug","end":{"line":4,"column":16}},"val":"str","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.pug","end":{"line":7,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.pug","end":{"line":7,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":7,"column":1},"filename":"/cases/mixins.pug","end":{"line":7,"column":27}},"val":"comment","args":"title, str"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/mixins.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"class","loc":{"start":{"line":8,"column":3},"filename":"/cases/mixins.pug","end":{"line":8,"column":11}},"val":"comment"}
+{"type":"indent","loc":{"start":{"line":9,"column":1},"filename":"/cases/mixins.pug","end":{"line":9,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":9,"column":5},"filename":"/cases/mixins.pug","end":{"line":9,"column":7}},"val":"h2"}
+{"type":"code","loc":{"start":{"line":9,"column":7},"filename":"/cases/mixins.pug","end":{"line":9,"column":14}},"val":"title","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/mixins.pug","end":{"line":10,"column":5}}}
+{"type":"tag","loc":{"start":{"line":10,"column":5},"filename":"/cases/mixins.pug","end":{"line":10,"column":6}},"val":"p"}
+{"type":"class","loc":{"start":{"line":10,"column":6},"filename":"/cases/mixins.pug","end":{"line":10,"column":11}},"val":"body"}
+{"type":"code","loc":{"start":{"line":10,"column":11},"filename":"/cases/mixins.pug","end":{"line":10,"column":16}},"val":"str","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixins.pug","end":{"line":12,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixins.pug","end":{"line":12,"column":1}}}
+{"type":"id","loc":{"start":{"line":12,"column":1},"filename":"/cases/mixins.pug","end":{"line":12,"column":6}},"val":"user"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/mixins.pug","end":{"line":13,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":13,"column":3},"filename":"/cases/mixins.pug","end":{"line":13,"column":5}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":13,"column":6},"filename":"/cases/mixins.pug","end":{"line":13,"column":10}},"val":"Tobi"}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/mixins.pug","end":{"line":14,"column":3}}}
+{"type":"class","loc":{"start":{"line":14,"column":3},"filename":"/cases/mixins.pug","end":{"line":14,"column":12}},"val":"comments"}
+{"type":"indent","loc":{"start":{"line":15,"column":1},"filename":"/cases/mixins.pug","end":{"line":15,"column":5}},"val":4}
+{"type":"call","loc":{"start":{"line":15,"column":5},"filename":"/cases/mixins.pug","end":{"line":16,"column":42}},"val":"comment","args":"'This',\n            (('is regular, javascript'))"}
+{"type":"outdent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixins.pug","end":{"line":18,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixins.pug","end":{"line":18,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":18,"column":1},"filename":"/cases/mixins.pug","end":{"line":18,"column":11}},"val":"list","args":null}
+{"type":"indent","loc":{"start":{"line":19,"column":1},"filename":"/cases/mixins.pug","end":{"line":19,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":19,"column":3},"filename":"/cases/mixins.pug","end":{"line":19,"column":5}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":20,"column":1},"filename":"/cases/mixins.pug","end":{"line":20,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":20,"column":5},"filename":"/cases/mixins.pug","end":{"line":20,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":20,"column":8},"filename":"/cases/mixins.pug","end":{"line":20,"column":11}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/mixins.pug","end":{"line":21,"column":5}}}
+{"type":"tag","loc":{"start":{"line":21,"column":5},"filename":"/cases/mixins.pug","end":{"line":21,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":21,"column":8},"filename":"/cases/mixins.pug","end":{"line":21,"column":11}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/mixins.pug","end":{"line":22,"column":5}}}
+{"type":"tag","loc":{"start":{"line":22,"column":5},"filename":"/cases/mixins.pug","end":{"line":22,"column":7}},"val":"li"}
+{"type":"text","loc":{"start":{"line":22,"column":8},"filename":"/cases/mixins.pug","end":{"line":22,"column":11}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixins.pug","end":{"line":24,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixins.pug","end":{"line":24,"column":1}}}
+{"type":"tag","loc":{"start":{"line":24,"column":1},"filename":"/cases/mixins.pug","end":{"line":24,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":25,"column":1},"filename":"/cases/mixins.pug","end":{"line":25,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":25,"column":3},"filename":"/cases/mixins.pug","end":{"line":25,"column":10}},"val":"list","args":""}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/mixins.pug","end":{"line":26,"column":3}}}
+{"type":"call","loc":{"start":{"line":26,"column":3},"filename":"/cases/mixins.pug","end":{"line":26,"column":11}},"val":"list","args":""}
+{"type":"outdent","loc":{"start":{"line":28,"column":1},"filename":"/cases/mixins.pug","end":{"line":28,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":28,"column":1},"filename":"/cases/mixins.pug","end":{"line":28,"column":18}},"val":"foobar","args":"str"}
+{"type":"indent","loc":{"start":{"line":29,"column":1},"filename":"/cases/mixins.pug","end":{"line":29,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":29,"column":3},"filename":"/cases/mixins.pug","end":{"line":29,"column":6}},"val":"div"}
+{"type":"id","loc":{"start":{"line":29,"column":6},"filename":"/cases/mixins.pug","end":{"line":29,"column":20}},"val":"interpolation"}
+{"type":"code","loc":{"start":{"line":29,"column":20},"filename":"/cases/mixins.pug","end":{"line":29,"column":42}},"val":"str + 'interpolated'","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixins.pug","end":{"line":31,"column":1}}}
+{"type":"code","loc":{"start":{"line":31,"column":1},"filename":"/cases/mixins.pug","end":{"line":31,"column":21}},"val":"var suffix = \"bar\"","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixins.pug","end":{"line":32,"column":1}}}
+{"type":"call","loc":{"start":{"line":32,"column":1},"filename":"/cases/mixins.pug","end":{"line":32,"column":31}},"val":"#{'foo' + suffix}","args":"'This is '"}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/mixins.pug","end":{"line":33,"column":1}}}
+{"type":"eos","loc":{"start":{"line":33,"column":1},"filename":"/cases/mixins.pug","end":{"line":33,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/namespaces.tokens.json b/packages/pug-parser/test/cases/namespaces.tokens.json
index 6935020b6..3454fca3a 100644
--- a/packages/pug-parser/test/cases/namespaces.tokens.json
+++ b/packages/pug-parser/test/cases/namespaces.tokens.json
@@ -1,8 +1,8 @@
-{"type":"tag","line":1,"col":1,"val":"fb:user:role"}
-{"type":"text","line":1,"col":14,"val":"Something"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"foo"}
-{"type":"start-attributes","line":2,"col":4}
-{"type":"attribute","line":2,"col":5,"name":"fb:foo","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":17}
-{"type":"eos","line":2,"col":18}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/namespaces.pug","end":{"line":1,"column":13}},"val":"fb:user:role"}
+{"type":"text","loc":{"start":{"line":1,"column":14},"filename":"/cases/namespaces.pug","end":{"line":1,"column":23}},"val":"Something"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/namespaces.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/namespaces.pug","end":{"line":2,"column":4}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":4},"filename":"/cases/namespaces.pug","end":{"line":2,"column":5}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":5},"filename":"/cases/namespaces.pug","end":{"line":2,"column":17}},"name":"fb:foo","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":17},"filename":"/cases/namespaces.pug","end":{"line":2,"column":18}}}
+{"type":"eos","loc":{"start":{"line":2,"column":18},"filename":"/cases/namespaces.pug","end":{"line":2,"column":18}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/nesting.tokens.json b/packages/pug-parser/test/cases/nesting.tokens.json
index dce4f1206..5b3481728 100644
--- a/packages/pug-parser/test/cases/nesting.tokens.json
+++ b/packages/pug-parser/test/cases/nesting.tokens.json
@@ -1,23 +1,23 @@
-{"type":"tag","line":1,"col":1,"val":"ul"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"li"}
-{"type":"text","line":2,"col":6,"val":"a"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":3,"val":"li"}
-{"type":"text","line":3,"col":6,"val":"b"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"li"}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"tag","line":5,"col":5,"val":"ul"}
-{"type":"indent","line":6,"col":1,"val":8}
-{"type":"tag","line":6,"col":9,"val":"li"}
-{"type":"text","line":6,"col":12,"val":"c"}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":9,"val":"li"}
-{"type":"text","line":7,"col":12,"val":"d"}
-{"type":"outdent","line":8,"col":5}
-{"type":"outdent","line":8,"col":3}
-{"type":"tag","line":8,"col":3,"val":"li"}
-{"type":"text","line":8,"col":6,"val":"e"}
-{"type":"outdent","line":8,"col":7}
-{"type":"eos","line":8,"col":7}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/nesting.pug","end":{"line":1,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/nesting.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/nesting.pug","end":{"line":2,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":2,"column":6},"filename":"/cases/nesting.pug","end":{"line":2,"column":7}},"val":"a"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/nesting.pug","end":{"line":3,"column":3}}}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/nesting.pug","end":{"line":3,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":3,"column":6},"filename":"/cases/nesting.pug","end":{"line":3,"column":7}},"val":"b"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/nesting.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/nesting.pug","end":{"line":4,"column":5}},"val":"li"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/nesting.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/nesting.pug","end":{"line":5,"column":7}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/nesting.pug","end":{"line":6,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":6,"column":9},"filename":"/cases/nesting.pug","end":{"line":6,"column":11}},"val":"li"}
+{"type":"text","loc":{"start":{"line":6,"column":12},"filename":"/cases/nesting.pug","end":{"line":6,"column":13}},"val":"c"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/nesting.pug","end":{"line":7,"column":9}}}
+{"type":"tag","loc":{"start":{"line":7,"column":9},"filename":"/cases/nesting.pug","end":{"line":7,"column":11}},"val":"li"}
+{"type":"text","loc":{"start":{"line":7,"column":12},"filename":"/cases/nesting.pug","end":{"line":7,"column":13}},"val":"d"}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/nesting.pug","end":{"line":8,"column":3}}}
+{"type":"outdent","loc":{"start":{"line":8,"column":1},"filename":"/cases/nesting.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/nesting.pug","end":{"line":8,"column":5}},"val":"li"}
+{"type":"text","loc":{"start":{"line":8,"column":6},"filename":"/cases/nesting.pug","end":{"line":8,"column":7}},"val":"e"}
+{"type":"outdent","loc":{"start":{"line":8,"column":7},"filename":"/cases/nesting.pug","end":{"line":8,"column":7}}}
+{"type":"eos","loc":{"start":{"line":8,"column":7},"filename":"/cases/nesting.pug","end":{"line":8,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pipeless-comments.tokens.json b/packages/pug-parser/test/cases/pipeless-comments.tokens.json
index 2363807ce..86e1ae5bf 100644
--- a/packages/pug-parser/test/cases/pipeless-comments.tokens.json
+++ b/packages/pug-parser/test/cases/pipeless-comments.tokens.json
@@ -1,9 +1,9 @@
-{"type":"comment","line":1,"col":1,"val":"","buffer":true}
-{"type":"start-pipeless-text","line":1,"col":3}
-{"type":"text","line":2,"col":3,"val":"     .foo"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"\t.bar"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":".hey"}
-{"type":"end-pipeless-text","line":4,"col":7}
-{"type":"eos","line":4,"col":7}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/pipeless-comments.pug","end":{"line":1,"column":3}},"val":"","buffer":true}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":1,"column":3}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":2,"column":12}},"val":"     .foo"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-comments.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":3,"column":8}},"val":"\t.bar"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":7}},"val":".hey"}
+{"type":"end-pipeless-text","loc":{"start":{"line":4,"column":7},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":7}}}
+{"type":"eos","loc":{"start":{"line":4,"column":7},"filename":"/cases/pipeless-comments.pug","end":{"line":4,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pipeless-filters.tokens.json b/packages/pug-parser/test/cases/pipeless-filters.tokens.json
index e92262005..390f039cc 100644
--- a/packages/pug-parser/test/cases/pipeless-filters.tokens.json
+++ b/packages/pug-parser/test/cases/pipeless-filters.tokens.json
@@ -1,9 +1,9 @@
-{"type":"filter","line":1,"col":1,"val":"markdown-it"}
-{"type":"start-pipeless-text","line":1,"col":13}
-{"type":"text","line":2,"col":3,"val":"    code sample"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":""}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"# Heading"}
-{"type":"end-pipeless-text","line":4,"col":12}
-{"type":"eos","line":4,"col":12}
\ No newline at end of file
+{"type":"filter","loc":{"start":{"line":1,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":1,"column":13}},"val":"markdown-it"}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":13},"filename":"/cases/pipeless-filters.pug","end":{"line":1,"column":13}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pipeless-filters.pug","end":{"line":2,"column":18}},"val":"    code sample"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":3,"column":1}}}
+{"type":"text","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":3,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":12}},"val":"# Heading"}
+{"type":"end-pipeless-text","loc":{"start":{"line":4,"column":12},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":12}}}
+{"type":"eos","loc":{"start":{"line":4,"column":12},"filename":"/cases/pipeless-filters.pug","end":{"line":4,"column":12}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pipeless-tag.tokens.json b/packages/pug-parser/test/cases/pipeless-tag.tokens.json
index 63ce5decc..beb9ce45e 100644
--- a/packages/pug-parser/test/cases/pipeless-tag.tokens.json
+++ b/packages/pug-parser/test/cases/pipeless-tag.tokens.json
@@ -1,14 +1,14 @@
-{"type":"tag","line":1,"col":1,"val":"pre"}
-{"type":"dot","line":1,"col":4}
-{"type":"start-pipeless-text","line":1,"col":5}
-{"type":"text","line":2,"col":3,"val":"  what"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"is "}
-{"type":"interpolated-code","line":3,"col":6,"val":"'going'","mustEscape":true,"buffer":true}
-{"type":"text","line":3,"col":16,"val":" "}
-{"type":"start-pug-interpolation","line":3,"col":17}
-{"type":"interpolated-code","line":3,"col":21,"val":"'on'","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":3,"col":28}
-{"type":"text","line":3,"col":29,"val":""}
-{"type":"end-pipeless-text","line":3,"col":29}
-{"type":"eos","line":3,"col":29}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/pipeless-tag.pug","end":{"line":1,"column":4}},"val":"pre"}
+{"type":"dot","loc":{"start":{"line":1,"column":4},"filename":"/cases/pipeless-tag.pug","end":{"line":1,"column":5}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":5},"filename":"/cases/pipeless-tag.pug","end":{"line":1,"column":5}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pipeless-tag.pug","end":{"line":2,"column":9}},"val":"  what"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":6}},"val":"is "}
+{"type":"interpolated-code","loc":{"start":{"line":3,"column":6},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":16}},"mustEscape":true,"buffer":true,"val":"'going'"}
+{"type":"text","loc":{"start":{"line":3,"column":16},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":17}},"val":" "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":3,"column":17},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":19}}}
+{"type":"interpolated-code","loc":{"start":{"line":3,"column":21},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":28}},"mustEscape":true,"buffer":true,"val":"'on'"}
+{"type":"end-pug-interpolation","loc":{"start":{"line":3,"column":28},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}}}
+{"type":"text","loc":{"start":{"line":3,"column":29},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":3,"column":29},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}}}
+{"type":"eos","loc":{"start":{"line":3,"column":29},"filename":"/cases/pipeless-tag.pug","end":{"line":3,"column":29}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/pre.tokens.json b/packages/pug-parser/test/cases/pre.tokens.json
index de60efbba..2a1fb132a 100644
--- a/packages/pug-parser/test/cases/pre.tokens.json
+++ b/packages/pug-parser/test/cases/pre.tokens.json
@@ -1,25 +1,25 @@
-{"type":"tag","line":1,"col":1,"val":"pre"}
-{"type":"dot","line":1,"col":4}
-{"type":"start-pipeless-text","line":1,"col":5}
-{"type":"text","line":2,"col":3,"val":"foo"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"bar"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"baz"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":3,"val":""}
-{"type":"end-pipeless-text","line":5,"col":3}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"pre"}
-{"type":"indent","line":7,"col":1,"val":2}
-{"type":"tag","line":7,"col":3,"val":"code"}
-{"type":"dot","line":7,"col":7}
-{"type":"start-pipeless-text","line":7,"col":8}
-{"type":"text","line":8,"col":5,"val":"foo"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":"bar"}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":"baz"}
-{"type":"end-pipeless-text","line":10,"col":8}
-{"type":"outdent","line":10,"col":8}
-{"type":"eos","line":10,"col":8}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/pre.pug","end":{"line":1,"column":4}},"val":"pre"}
+{"type":"dot","loc":{"start":{"line":1,"column":4},"filename":"/cases/pre.pug","end":{"line":1,"column":5}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":5},"filename":"/cases/pre.pug","end":{"line":1,"column":5}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/pre.pug","end":{"line":2,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/pre.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/pre.pug","end":{"line":3,"column":6}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/pre.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/pre.pug","end":{"line":4,"column":6}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/pre.pug","end":{"line":5,"column":1}}}
+{"type":"text","loc":{"start":{"line":5,"column":1},"filename":"/cases/pre.pug","end":{"line":5,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":5,"column":1},"filename":"/cases/pre.pug","end":{"line":5,"column":1}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/pre.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/pre.pug","end":{"line":6,"column":4}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":7,"column":1},"filename":"/cases/pre.pug","end":{"line":7,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/pre.pug","end":{"line":7,"column":7}},"val":"code"}
+{"type":"dot","loc":{"start":{"line":7,"column":7},"filename":"/cases/pre.pug","end":{"line":7,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":7,"column":8},"filename":"/cases/pre.pug","end":{"line":7,"column":8}}}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/pre.pug","end":{"line":8,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/pre.pug","end":{"line":9,"column":5}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/pre.pug","end":{"line":9,"column":8}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/pre.pug","end":{"line":10,"column":5}}}
+{"type":"text","loc":{"start":{"line":10,"column":5},"filename":"/cases/pre.pug","end":{"line":10,"column":8}},"val":"baz"}
+{"type":"end-pipeless-text","loc":{"start":{"line":10,"column":8},"filename":"/cases/pre.pug","end":{"line":10,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":10,"column":8},"filename":"/cases/pre.pug","end":{"line":10,"column":8}}}
+{"type":"eos","loc":{"start":{"line":10,"column":8},"filename":"/cases/pre.pug","end":{"line":10,"column":8}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/quotes.tokens.json b/packages/pug-parser/test/cases/quotes.tokens.json
index 681b853cd..c53e9c0ee 100644
--- a/packages/pug-parser/test/cases/quotes.tokens.json
+++ b/packages/pug-parser/test/cases/quotes.tokens.json
@@ -1,6 +1,6 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"\"foo\""}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"p"}
-{"type":"text","line":2,"col":3,"val":"'foo'"}
-{"type":"eos","line":2,"col":8}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/quotes.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/quotes.pug","end":{"line":1,"column":8}},"val":"\"foo\""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/quotes.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/quotes.pug","end":{"line":2,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/quotes.pug","end":{"line":2,"column":8}},"val":"'foo'"}
+{"type":"eos","loc":{"start":{"line":2,"column":8},"filename":"/cases/quotes.pug","end":{"line":2,"column":8}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/regression.1794.tokens.json b/packages/pug-parser/test/cases/regression.1794.tokens.json
index e1589d85d..d1d8c5b67 100644
--- a/packages/pug-parser/test/cases/regression.1794.tokens.json
+++ b/packages/pug-parser/test/cases/regression.1794.tokens.json
@@ -1,9 +1,9 @@
-{"type":"extends","line":1,"col":1}
-{"type":"path","line":1,"col":9,"val":"./auxiliary/1794-extends.pug"}
-{"type":"newline","line":3,"col":1}
-{"type":"block","line":3,"col":1,"val":"content","mode":"replace"}
-{"type":"indent","line":4,"col":1,"val":2}
-{"type":"include","line":4,"col":3}
-{"type":"path","line":4,"col":11,"val":"./auxiliary/1794-include.pug"}
-{"type":"outdent","line":4,"col":39}
-{"type":"eos","line":4,"col":39}
\ No newline at end of file
+{"type":"extends","loc":{"start":{"line":1,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":1,"column":8}}}
+{"type":"path","loc":{"start":{"line":1,"column":9},"filename":"/cases/regression.1794.pug","end":{"line":1,"column":37}},"val":"./auxiliary/1794-extends.pug"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":3,"column":1}}}
+{"type":"block","loc":{"start":{"line":3,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":3,"column":14}},"val":"content","mode":"replace"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":3}},"val":2}
+{"type":"include","loc":{"start":{"line":4,"column":3},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":10}}}
+{"type":"path","loc":{"start":{"line":4,"column":11},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":39}},"val":"./auxiliary/1794-include.pug"}
+{"type":"outdent","loc":{"start":{"line":4,"column":39},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":39}}}
+{"type":"eos","loc":{"start":{"line":4,"column":39},"filename":"/cases/regression.1794.pug","end":{"line":4,"column":39}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/regression.784.tokens.json b/packages/pug-parser/test/cases/regression.784.tokens.json
index 3caea3778..52a0b397e 100644
--- a/packages/pug-parser/test/cases/regression.784.tokens.json
+++ b/packages/pug-parser/test/cases/regression.784.tokens.json
@@ -1,5 +1,5 @@
-{"type":"code","line":1,"col":1,"val":"var url = 'http://www.google.com'","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"class","line":2,"col":1,"val":"url"}
-{"type":"interpolated-code","line":2,"col":6,"val":"url.replace('http://', '').replace(/^www\\./, '')","mustEscape":true,"buffer":true}
-{"type":"eos","line":2,"col":57}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/regression.784.pug","end":{"line":1,"column":36}},"val":"var url = 'http://www.google.com'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/regression.784.pug","end":{"line":2,"column":1}}}
+{"type":"class","loc":{"start":{"line":2,"column":1},"filename":"/cases/regression.784.pug","end":{"line":2,"column":5}},"val":"url"}
+{"type":"interpolated-code","loc":{"start":{"line":2,"column":6},"filename":"/cases/regression.784.pug","end":{"line":2,"column":57}},"mustEscape":true,"buffer":true,"val":"url.replace('http://', '').replace(/^www\\./, '')"}
+{"type":"eos","loc":{"start":{"line":2,"column":57},"filename":"/cases/regression.784.pug","end":{"line":2,"column":57}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/script.whitespace.tokens.json b/packages/pug-parser/test/cases/script.whitespace.tokens.json
index 2414caa48..d6facf1a1 100644
--- a/packages/pug-parser/test/cases/script.whitespace.tokens.json
+++ b/packages/pug-parser/test/cases/script.whitespace.tokens.json
@@ -1,14 +1,14 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"dot","line":1,"col":7}
-{"type":"start-pipeless-text","line":1,"col":8}
-{"type":"text","line":2,"col":3,"val":"if (foo) {"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"  "}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"  bar();"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":3,"val":""}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":3,"val":"}"}
-{"type":"end-pipeless-text","line":6,"col":4}
-{"type":"eos","line":6,"col":4}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"dot","loc":{"start":{"line":1,"column":7},"filename":"/cases/script.whitespace.pug","end":{"line":1,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":8},"filename":"/cases/script.whitespace.pug","end":{"line":1,"column":8}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":2,"column":13}},"val":"if (foo) {"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":3,"column":5}},"val":"  "}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":4,"column":11}},"val":"  bar();"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":5,"column":3}},"val":""}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":3}}}
+{"type":"text","loc":{"start":{"line":6,"column":3},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":4}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":4},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":4}}}
+{"type":"eos","loc":{"start":{"line":6,"column":4},"filename":"/cases/script.whitespace.pug","end":{"line":6,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/scripts.non-js.tokens.json b/packages/pug-parser/test/cases/scripts.non-js.tokens.json
index 745a45d86..7a78b63b8 100644
--- a/packages/pug-parser/test/cases/scripts.non-js.tokens.json
+++ b/packages/pug-parser/test/cases/scripts.non-js.tokens.json
@@ -1,29 +1,29 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"id","line":1,"col":7,"val":"user-template"}
-{"type":"start-attributes","line":1,"col":21}
-{"type":"attribute","line":1,"col":22,"name":"type","val":"'text/template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":42}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"id","line":2,"col":3,"val":"user"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h1"}
-{"type":"text","line":3,"col":8,"val":"<%= user.name %>"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"p"}
-{"type":"text","line":4,"col":7,"val":"<%= user.description %>"}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"id","line":6,"col":7,"val":"user-template"}
-{"type":"start-attributes","line":6,"col":21}
-{"type":"attribute","line":6,"col":22,"name":"type","val":"'text/template'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":42}
-{"type":"dot","line":6,"col":43}
-{"type":"start-pipeless-text","line":6,"col":44}
-{"type":"text","line":7,"col":3,"val":"if (foo) {"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"  bar();"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":"}"}
-{"type":"end-pipeless-text","line":9,"col":4}
-{"type":"eos","line":9,"col":4}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"id","loc":{"start":{"line":1,"column":7},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":21}},"val":"user-template"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":21},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":22},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":42}},"name":"type","mustEscape":true,"val":"'text/template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":42},"filename":"/cases/scripts.non-js.pug","end":{"line":1,"column":43}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"id","loc":{"start":{"line":2,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":2,"column":8}},"val":"user"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/scripts.non-js.pug","end":{"line":3,"column":7}},"val":"h1"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/scripts.non-js.pug","end":{"line":3,"column":24}},"val":"<%= user.name %>"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/scripts.non-js.pug","end":{"line":4,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/scripts.non-js.pug","end":{"line":4,"column":30}},"val":"<%= user.description %>"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"id","loc":{"start":{"line":6,"column":7},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":21}},"val":"user-template"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":21},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":22}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":22},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":42}},"name":"type","mustEscape":true,"val":"'text/template'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":42},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":43}}}
+{"type":"dot","loc":{"start":{"line":6,"column":43},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":44}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":6,"column":44},"filename":"/cases/scripts.non-js.pug","end":{"line":6,"column":44}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":7,"column":13}},"val":"if (foo) {"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":8,"column":11}},"val":"  bar();"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":3},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":4}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":4},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":4}}}
+{"type":"eos","loc":{"start":{"line":9,"column":4},"filename":"/cases/scripts.non-js.pug","end":{"line":9,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/scripts.tokens.json b/packages/pug-parser/test/cases/scripts.tokens.json
index c990ab187..9b0600065 100644
--- a/packages/pug-parser/test/cases/scripts.tokens.json
+++ b/packages/pug-parser/test/cases/scripts.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"dot","line":1,"col":7}
-{"type":"start-pipeless-text","line":1,"col":8}
-{"type":"text","line":2,"col":3,"val":"if (foo) {"}
-{"type":"newline","line":3,"col":1}
-{"type":"text","line":3,"col":3,"val":"  bar();"}
-{"type":"newline","line":4,"col":1}
-{"type":"text","line":4,"col":3,"val":"}"}
-{"type":"end-pipeless-text","line":4,"col":4}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"script"}
-{"type":"code","line":5,"col":7,"val":"'foo()'","mustEscape":false,"buffer":true}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"text","line":6,"col":8,"val":"foo()"}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"script"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":1,"val":"div"}
-{"type":"eos","line":8,"col":4}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/scripts.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"dot","loc":{"start":{"line":1,"column":7},"filename":"/cases/scripts.pug","end":{"line":1,"column":8}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":1,"column":8},"filename":"/cases/scripts.pug","end":{"line":1,"column":8}}}
+{"type":"text","loc":{"start":{"line":2,"column":3},"filename":"/cases/scripts.pug","end":{"line":2,"column":13}},"val":"if (foo) {"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/scripts.pug","end":{"line":3,"column":3}}}
+{"type":"text","loc":{"start":{"line":3,"column":3},"filename":"/cases/scripts.pug","end":{"line":3,"column":11}},"val":"  bar();"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/scripts.pug","end":{"line":4,"column":3}}}
+{"type":"text","loc":{"start":{"line":4,"column":3},"filename":"/cases/scripts.pug","end":{"line":4,"column":4}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":4,"column":4},"filename":"/cases/scripts.pug","end":{"line":4,"column":4}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/scripts.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/scripts.pug","end":{"line":5,"column":7}},"val":"script"}
+{"type":"code","loc":{"start":{"line":5,"column":7},"filename":"/cases/scripts.pug","end":{"line":5,"column":17}},"val":"'foo()'","mustEscape":false,"buffer":true}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/scripts.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"text","loc":{"start":{"line":6,"column":8},"filename":"/cases/scripts.pug","end":{"line":6,"column":13}},"val":"foo()"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/scripts.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/scripts.pug","end":{"line":7,"column":7}},"val":"script"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/scripts.pug","end":{"line":8,"column":1}}}
+{"type":"tag","loc":{"start":{"line":8,"column":1},"filename":"/cases/scripts.pug","end":{"line":8,"column":4}},"val":"div"}
+{"type":"eos","loc":{"start":{"line":8,"column":4},"filename":"/cases/scripts.pug","end":{"line":8,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/self-closing-html.tokens.json b/packages/pug-parser/test/cases/self-closing-html.tokens.json
index 12762fd12..3bd62262c 100644
--- a/packages/pug-parser/test/cases/self-closing-html.tokens.json
+++ b/packages/pug-parser/test/cases/self-closing-html.tokens.json
@@ -1,11 +1,11 @@
-{"type":"doctype","line":1,"col":1,"val":"html"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"html"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"body"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"tag","line":4,"col":5,"val":"br"}
-{"type":"slash","line":4,"col":7}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":1,"column":13}},"val":"html"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":2,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/self-closing-html.pug","end":{"line":3,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/self-closing-html.pug","end":{"line":4,"column":7}},"val":"br"}
+{"type":"slash","loc":{"start":{"line":4,"column":7},"filename":"/cases/self-closing-html.pug","end":{"line":4,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/self-closing-html.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/single-period.tokens.json b/packages/pug-parser/test/cases/single-period.tokens.json
index a0d1c81d0..ad94eaed9 100644
--- a/packages/pug-parser/test/cases/single-period.tokens.json
+++ b/packages/pug-parser/test/cases/single-period.tokens.json
@@ -1,3 +1,3 @@
-{"type":"tag","line":1,"col":1,"val":"span"}
-{"type":"text","line":1,"col":6,"val":"."}
-{"type":"eos","line":1,"col":7}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/single-period.pug","end":{"line":1,"column":5}},"val":"span"}
+{"type":"text","loc":{"start":{"line":1,"column":6},"filename":"/cases/single-period.pug","end":{"line":1,"column":7}},"val":"."}
+{"type":"eos","loc":{"start":{"line":1,"column":7},"filename":"/cases/single-period.pug","end":{"line":1,"column":7}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/source.tokens.json b/packages/pug-parser/test/cases/source.tokens.json
index 05cc23b6e..9027d9708 100644
--- a/packages/pug-parser/test/cases/source.tokens.json
+++ b/packages/pug-parser/test/cases/source.tokens.json
@@ -1,21 +1,21 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"audio"}
-{"type":"start-attributes","line":2,"col":8}
-{"type":"attribute","line":2,"col":9,"name":"preload","val":"'auto'","mustEscape":true}
-{"type":"attribute","line":2,"col":25,"name":"autobuffer","val":true,"mustEscape":false}
-{"type":"attribute","line":2,"col":37,"name":"controls","val":true,"mustEscape":false}
-{"type":"end-attributes","line":2,"col":45}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"source"}
-{"type":"start-attributes","line":3,"col":11}
-{"type":"attribute","line":3,"col":12,"name":"src","val":"'foo'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":21}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"source"}
-{"type":"start-attributes","line":4,"col":11}
-{"type":"attribute","line":4,"col":12,"name":"src","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":21}
-{"type":"outdent","line":4,"col":22}
-{"type":"outdent","line":4,"col":22}
-{"type":"eos","line":4,"col":22}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/source.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/source.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/source.pug","end":{"line":2,"column":8}},"val":"audio"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":8},"filename":"/cases/source.pug","end":{"line":2,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":9},"filename":"/cases/source.pug","end":{"line":2,"column":23}},"name":"preload","mustEscape":true,"val":"'auto'"}
+{"type":"attribute","loc":{"start":{"line":2,"column":25},"filename":"/cases/source.pug","end":{"line":2,"column":35}},"name":"autobuffer","mustEscape":true,"val":true}
+{"type":"attribute","loc":{"start":{"line":2,"column":37},"filename":"/cases/source.pug","end":{"line":2,"column":45}},"name":"controls","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":45},"filename":"/cases/source.pug","end":{"line":2,"column":46}}}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/source.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/source.pug","end":{"line":3,"column":11}},"val":"source"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":11},"filename":"/cases/source.pug","end":{"line":3,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":12},"filename":"/cases/source.pug","end":{"line":3,"column":21}},"name":"src","mustEscape":true,"val":"'foo'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":21},"filename":"/cases/source.pug","end":{"line":3,"column":22}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/source.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/source.pug","end":{"line":4,"column":11}},"val":"source"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":11},"filename":"/cases/source.pug","end":{"line":4,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":12},"filename":"/cases/source.pug","end":{"line":4,"column":21}},"name":"src","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":21},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":22},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":22},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
+{"type":"eos","loc":{"start":{"line":4,"column":22},"filename":"/cases/source.pug","end":{"line":4,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/styles.tokens.json b/packages/pug-parser/test/cases/styles.tokens.json
index 44bf2f325..037392c94 100644
--- a/packages/pug-parser/test/cases/styles.tokens.json
+++ b/packages/pug-parser/test/cases/styles.tokens.json
@@ -1,64 +1,64 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"head"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"style"}
-{"type":"dot","line":3,"col":10}
-{"type":"start-pipeless-text","line":3,"col":11}
-{"type":"text","line":4,"col":7,"val":"body {"}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":7,"val":"  padding: 50px;"}
-{"type":"newline","line":6,"col":1}
-{"type":"text","line":6,"col":7,"val":"}"}
-{"type":"end-pipeless-text","line":6,"col":8}
-{"type":"outdent","line":7,"col":3}
-{"type":"tag","line":7,"col":3,"val":"body"}
-{"type":"indent","line":8,"col":1,"val":4}
-{"type":"tag","line":8,"col":5,"val":"div"}
-{"type":"start-attributes","line":8,"col":8}
-{"type":"attribute","line":8,"col":9,"name":"style","val":"'color:red;background:green'","mustEscape":true}
-{"type":"end-attributes","line":8,"col":43}
-{"type":"newline","line":9,"col":1}
-{"type":"tag","line":9,"col":5,"val":"div"}
-{"type":"start-attributes","line":9,"col":8}
-{"type":"attribute","line":9,"col":9,"name":"style","val":"{color: 'red', background: 'green'}","mustEscape":true}
-{"type":"end-attributes","line":9,"col":50}
-{"type":"newline","line":10,"col":1}
-{"type":"tag","line":10,"col":5,"val":"div"}
-{"type":"&attributes","line":10,"col":8,"val":"{style: 'color:red;background:green'}"}
-{"type":"newline","line":11,"col":1}
-{"type":"tag","line":11,"col":5,"val":"div"}
-{"type":"&attributes","line":11,"col":8,"val":"{style: {color: 'red', background: 'green'}}"}
-{"type":"newline","line":12,"col":1}
-{"type":"mixin","line":12,"col":5,"val":"div","args":null}
-{"type":"indent","line":13,"col":1,"val":6}
-{"type":"tag","line":13,"col":7,"val":"div"}
-{"type":"&attributes","line":13,"col":10,"val":"attributes"}
-{"type":"outdent","line":14,"col":5}
-{"type":"call","line":14,"col":5,"val":"div","args":null}
-{"type":"start-attributes","line":14,"col":9}
-{"type":"attribute","line":14,"col":10,"name":"style","val":"'color:red;background:green'","mustEscape":true}
-{"type":"end-attributes","line":14,"col":44}
-{"type":"newline","line":15,"col":1}
-{"type":"call","line":15,"col":5,"val":"div","args":null}
-{"type":"start-attributes","line":15,"col":9}
-{"type":"attribute","line":15,"col":10,"name":"style","val":"{color: 'red', background: 'green'}","mustEscape":true}
-{"type":"end-attributes","line":15,"col":51}
-{"type":"newline","line":16,"col":1}
-{"type":"code","line":16,"col":5,"val":"var bg = 'green';","mustEscape":false,"buffer":false}
-{"type":"newline","line":17,"col":1}
-{"type":"tag","line":17,"col":5,"val":"div"}
-{"type":"start-attributes","line":17,"col":8}
-{"type":"attribute","line":17,"col":9,"name":"style","val":"{color: 'red', background: bg}","mustEscape":true}
-{"type":"end-attributes","line":17,"col":45}
-{"type":"newline","line":18,"col":1}
-{"type":"tag","line":18,"col":5,"val":"div"}
-{"type":"&attributes","line":18,"col":8,"val":"{style: {color: 'red', background: bg}}"}
-{"type":"newline","line":19,"col":1}
-{"type":"call","line":19,"col":5,"val":"div","args":null}
-{"type":"start-attributes","line":19,"col":9}
-{"type":"attribute","line":19,"col":10,"name":"style","val":"{color: 'red', background: bg}","mustEscape":true}
-{"type":"end-attributes","line":19,"col":46}
-{"type":"outdent","line":20,"col":3}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/styles.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/styles.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/styles.pug","end":{"line":2,"column":7}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/styles.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/styles.pug","end":{"line":3,"column":10}},"val":"style"}
+{"type":"dot","loc":{"start":{"line":3,"column":10},"filename":"/cases/styles.pug","end":{"line":3,"column":11}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":3,"column":11},"filename":"/cases/styles.pug","end":{"line":3,"column":11}}}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/styles.pug","end":{"line":4,"column":13}},"val":"body {"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/styles.pug","end":{"line":5,"column":7}}}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/styles.pug","end":{"line":5,"column":23}},"val":"  padding: 50px;"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/styles.pug","end":{"line":6,"column":7}}}
+{"type":"text","loc":{"start":{"line":6,"column":7},"filename":"/cases/styles.pug","end":{"line":6,"column":8}},"val":"}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":6,"column":8},"filename":"/cases/styles.pug","end":{"line":6,"column":8}}}
+{"type":"outdent","loc":{"start":{"line":7,"column":1},"filename":"/cases/styles.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/styles.pug","end":{"line":7,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/styles.pug","end":{"line":8,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":8,"column":5},"filename":"/cases/styles.pug","end":{"line":8,"column":8}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":8},"filename":"/cases/styles.pug","end":{"line":8,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":9},"filename":"/cases/styles.pug","end":{"line":8,"column":43}},"name":"style","mustEscape":true,"val":"'color:red;background:green'"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":43},"filename":"/cases/styles.pug","end":{"line":8,"column":44}}}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/styles.pug","end":{"line":9,"column":5}}}
+{"type":"tag","loc":{"start":{"line":9,"column":5},"filename":"/cases/styles.pug","end":{"line":9,"column":8}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":9,"column":8},"filename":"/cases/styles.pug","end":{"line":9,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":9,"column":9},"filename":"/cases/styles.pug","end":{"line":9,"column":50}},"name":"style","mustEscape":true,"val":"{color: 'red', background: 'green'}"}
+{"type":"end-attributes","loc":{"start":{"line":9,"column":50},"filename":"/cases/styles.pug","end":{"line":9,"column":51}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/styles.pug","end":{"line":10,"column":5}}}
+{"type":"tag","loc":{"start":{"line":10,"column":5},"filename":"/cases/styles.pug","end":{"line":10,"column":8}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":10,"column":8},"filename":"/cases/styles.pug","end":{"line":10,"column":58}},"val":"{style: 'color:red;background:green'}"}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/styles.pug","end":{"line":11,"column":5}}}
+{"type":"tag","loc":{"start":{"line":11,"column":5},"filename":"/cases/styles.pug","end":{"line":11,"column":8}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":11,"column":8},"filename":"/cases/styles.pug","end":{"line":11,"column":65}},"val":"{style: {color: 'red', background: 'green'}}"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/styles.pug","end":{"line":12,"column":5}}}
+{"type":"mixin","loc":{"start":{"line":12,"column":5},"filename":"/cases/styles.pug","end":{"line":12,"column":16}},"val":"div","args":null}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/styles.pug","end":{"line":13,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":13,"column":7},"filename":"/cases/styles.pug","end":{"line":13,"column":10}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":13,"column":10},"filename":"/cases/styles.pug","end":{"line":13,"column":33}},"val":"attributes"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/styles.pug","end":{"line":14,"column":5}}}
+{"type":"call","loc":{"start":{"line":14,"column":5},"filename":"/cases/styles.pug","end":{"line":14,"column":9}},"val":"div","args":null}
+{"type":"start-attributes","loc":{"start":{"line":14,"column":9},"filename":"/cases/styles.pug","end":{"line":14,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":14,"column":10},"filename":"/cases/styles.pug","end":{"line":14,"column":44}},"name":"style","mustEscape":true,"val":"'color:red;background:green'"}
+{"type":"end-attributes","loc":{"start":{"line":14,"column":44},"filename":"/cases/styles.pug","end":{"line":14,"column":45}}}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/styles.pug","end":{"line":15,"column":5}}}
+{"type":"call","loc":{"start":{"line":15,"column":5},"filename":"/cases/styles.pug","end":{"line":15,"column":9}},"val":"div","args":null}
+{"type":"start-attributes","loc":{"start":{"line":15,"column":9},"filename":"/cases/styles.pug","end":{"line":15,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":15,"column":10},"filename":"/cases/styles.pug","end":{"line":15,"column":51}},"name":"style","mustEscape":true,"val":"{color: 'red', background: 'green'}"}
+{"type":"end-attributes","loc":{"start":{"line":15,"column":51},"filename":"/cases/styles.pug","end":{"line":15,"column":52}}}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/styles.pug","end":{"line":16,"column":5}}}
+{"type":"code","loc":{"start":{"line":16,"column":5},"filename":"/cases/styles.pug","end":{"line":16,"column":24}},"val":"var bg = 'green';","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/styles.pug","end":{"line":17,"column":5}}}
+{"type":"tag","loc":{"start":{"line":17,"column":5},"filename":"/cases/styles.pug","end":{"line":17,"column":8}},"val":"div"}
+{"type":"start-attributes","loc":{"start":{"line":17,"column":8},"filename":"/cases/styles.pug","end":{"line":17,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":17,"column":9},"filename":"/cases/styles.pug","end":{"line":17,"column":45}},"name":"style","mustEscape":true,"val":"{color: 'red', background: bg}"}
+{"type":"end-attributes","loc":{"start":{"line":17,"column":45},"filename":"/cases/styles.pug","end":{"line":17,"column":46}}}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/styles.pug","end":{"line":18,"column":5}}}
+{"type":"tag","loc":{"start":{"line":18,"column":5},"filename":"/cases/styles.pug","end":{"line":18,"column":8}},"val":"div"}
+{"type":"&attributes","loc":{"start":{"line":18,"column":8},"filename":"/cases/styles.pug","end":{"line":18,"column":60}},"val":"{style: {color: 'red', background: bg}}"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/styles.pug","end":{"line":19,"column":5}}}
+{"type":"call","loc":{"start":{"line":19,"column":5},"filename":"/cases/styles.pug","end":{"line":19,"column":9}},"val":"div","args":null}
+{"type":"start-attributes","loc":{"start":{"line":19,"column":9},"filename":"/cases/styles.pug","end":{"line":19,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":19,"column":10},"filename":"/cases/styles.pug","end":{"line":19,"column":46}},"name":"style","mustEscape":true,"val":"{color: 'red', background: bg}"}
+{"type":"end-attributes","loc":{"start":{"line":19,"column":46},"filename":"/cases/styles.pug","end":{"line":19,"column":47}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/styles.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/styles.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/styles.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/tag-blocks.tokens.json b/packages/pug-parser/test/cases/tag-blocks.tokens.json
index d1d140c7d..1c250eec1 100644
--- a/packages/pug-parser/test/cases/tag-blocks.tokens.json
+++ b/packages/pug-parser/test/cases/tag-blocks.tokens.json
@@ -1,16 +1,16 @@
-{"type":"comment","line":1,"col":1,"val":" we should not get blocks within blocks","buffer":true}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"div"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"text","line":3,"col":5,"val":"We have sent an e-mail to "}
-{"type":"start-pug-interpolation","line":3,"col":31}
-{"type":"tag","line":3,"col":33,"val":"strong"}
-{"type":"code","line":3,"col":39,"val":"this.props.email","mustEscape":true,"buffer":true}
-{"type":"end-pug-interpolation","line":3,"col":57}
-{"type":"text","line":3,"col":58,"val":".  Please click the link in the e-mail"}
-{"type":"newline","line":4,"col":1}
-{"type":"code","line":4,"col":3,"val":"'  '","mustEscape":true,"buffer":true}
-{"type":"newline","line":5,"col":1}
-{"type":"text","line":5,"col":5,"val":"to confirm your e-mail address."}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"comment","loc":{"start":{"line":1,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":1,"column":42}},"val":" we should not get blocks within blocks","buffer":true}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":2,"column":4}},"val":"div"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":3,"column":5},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":31}},"val":"We have sent an e-mail to "}
+{"type":"start-pug-interpolation","loc":{"start":{"line":3,"column":31},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":33}}}
+{"type":"tag","loc":{"start":{"line":3,"column":33},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":39}},"val":"strong"}
+{"type":"code","loc":{"start":{"line":3,"column":39},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":57}},"val":"this.props.email","mustEscape":true,"buffer":true}
+{"type":"end-pug-interpolation","loc":{"start":{"line":3,"column":57},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":58}}}
+{"type":"text","loc":{"start":{"line":3,"column":58},"filename":"/cases/tag-blocks.pug","end":{"line":3,"column":96}},"val":".  Please click the link in the e-mail"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":4,"column":3}}}
+{"type":"code","loc":{"start":{"line":4,"column":3},"filename":"/cases/tag-blocks.pug","end":{"line":4,"column":9}},"val":"'  '","mustEscape":true,"buffer":true}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":5,"column":3}}}
+{"type":"text","loc":{"start":{"line":5,"column":5},"filename":"/cases/tag-blocks.pug","end":{"line":5,"column":36}},"val":"to confirm your e-mail address."}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag-blocks.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/tag.interpolation.tokens.json b/packages/pug-parser/test/cases/tag.interpolation.tokens.json
index 37268943c..3dae845f0 100644
--- a/packages/pug-parser/test/cases/tag.interpolation.tokens.json
+++ b/packages/pug-parser/test/cases/tag.interpolation.tokens.json
@@ -1,66 +1,66 @@
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var tag = 'p'","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"code","line":3,"col":1,"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"interpolation","line":5,"col":1,"val":"tag"}
-{"type":"text","line":5,"col":8,"val":"value"}
-{"type":"newline","line":6,"col":1}
-{"type":"interpolation","line":6,"col":1,"val":"tag"}
-{"type":"start-attributes","line":6,"col":7}
-{"type":"attribute","line":6,"col":8,"name":"foo","val":"'bar'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":17}
-{"type":"text","line":6,"col":19,"val":"value"}
-{"type":"newline","line":7,"col":1}
-{"type":"interpolation","line":7,"col":1,"val":"foo ? 'a' : 'li'"}
-{"type":"start-attributes","line":7,"col":20}
-{"type":"attribute","line":7,"col":21,"name":"something","val":true,"mustEscape":true}
-{"type":"end-attributes","line":7,"col":30}
-{"type":"text","line":7,"col":32,"val":"here"}
-{"type":"newline","line":9,"col":1}
-{"type":"mixin","line":9,"col":1,"val":"item","args":"icon"}
-{"type":"indent","line":10,"col":1,"val":2}
-{"type":"tag","line":10,"col":3,"val":"li"}
-{"type":"indent","line":11,"col":1,"val":4}
-{"type":"if","line":11,"col":5,"val":"attributes.href"}
-{"type":"indent","line":12,"col":1,"val":6}
-{"type":"tag","line":12,"col":7,"val":"a"}
-{"type":"&attributes","line":12,"col":8,"val":"attributes"}
-{"type":"indent","line":13,"col":1,"val":8}
-{"type":"tag","line":13,"col":9,"val":"img"}
-{"type":"class","line":13,"col":12,"val":"icon"}
-{"type":"start-attributes","line":13,"col":17}
-{"type":"attribute","line":13,"col":18,"name":"src","val":"icon","mustEscape":true}
-{"type":"end-attributes","line":13,"col":26}
-{"type":"newline","line":14,"col":1}
-{"type":"mixin-block","line":14,"col":9}
-{"type":"outdent","line":15,"col":7}
-{"type":"outdent","line":15,"col":5}
-{"type":"else","line":15,"col":5,"val":""}
-{"type":"indent","line":16,"col":1,"val":6}
-{"type":"tag","line":16,"col":7,"val":"span"}
-{"type":"&attributes","line":16,"col":11,"val":"attributes"}
-{"type":"indent","line":17,"col":1,"val":8}
-{"type":"tag","line":17,"col":9,"val":"img"}
-{"type":"class","line":17,"col":12,"val":"icon"}
-{"type":"start-attributes","line":17,"col":17}
-{"type":"attribute","line":17,"col":18,"name":"src","val":"icon","mustEscape":true}
-{"type":"end-attributes","line":17,"col":26}
-{"type":"newline","line":18,"col":1}
-{"type":"mixin-block","line":18,"col":9}
-{"type":"outdent","line":20,"col":7}
-{"type":"outdent","line":20,"col":5}
-{"type":"outdent","line":20,"col":3}
-{"type":"outdent","line":20,"col":1}
-{"type":"tag","line":20,"col":1,"val":"ul"}
-{"type":"indent","line":21,"col":1,"val":2}
-{"type":"call","line":21,"col":3,"val":"item","args":"'contact'"}
-{"type":"text","line":21,"col":20,"val":"Contact"}
-{"type":"newline","line":22,"col":1}
-{"type":"call","line":22,"col":3,"val":"item","args":null}
-{"type":"start-attributes","line":22,"col":8}
-{"type":"attribute","line":22,"col":9,"name":"href","val":"'/contact'","mustEscape":true}
-{"type":"end-attributes","line":22,"col":24}
-{"type":"text","line":22,"col":26,"val":"Contact"}
-{"type":"outdent","line":23,"col":1}
-{"type":"eos","line":23,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":2,"column":16}},"val":"var tag = 'p'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":3,"column":1}}}
+{"type":"code","loc":{"start":{"line":3,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":3,"column":18}},"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":5,"column":1}}}
+{"type":"interpolation","loc":{"start":{"line":5,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":5,"column":7}},"val":"tag"}
+{"type":"text","loc":{"start":{"line":5,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":5,"column":13}},"val":"value"}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":1}}}
+{"type":"interpolation","loc":{"start":{"line":6,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":7}},"val":"tag"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":7},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":17}},"name":"foo","mustEscape":true,"val":"'bar'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":17},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":18}}}
+{"type":"text","loc":{"start":{"line":6,"column":19},"filename":"/cases/tag.interpolation.pug","end":{"line":6,"column":24}},"val":"value"}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":1}}}
+{"type":"interpolation","loc":{"start":{"line":7,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":20}},"val":"foo ? 'a' : 'li'"}
+{"type":"start-attributes","loc":{"start":{"line":7,"column":20},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":21}}}
+{"type":"attribute","loc":{"start":{"line":7,"column":21},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":30}},"name":"something","mustEscape":true,"val":true}
+{"type":"end-attributes","loc":{"start":{"line":7,"column":30},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":31}}}
+{"type":"text","loc":{"start":{"line":7,"column":32},"filename":"/cases/tag.interpolation.pug","end":{"line":7,"column":36}},"val":"here"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":9,"column":1}}}
+{"type":"mixin","loc":{"start":{"line":9,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":9,"column":17}},"val":"item","args":"icon"}
+{"type":"indent","loc":{"start":{"line":10,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":10,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":10,"column":3},"filename":"/cases/tag.interpolation.pug","end":{"line":10,"column":5}},"val":"li"}
+{"type":"indent","loc":{"start":{"line":11,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":11,"column":5}},"val":4}
+{"type":"if","loc":{"start":{"line":11,"column":5},"filename":"/cases/tag.interpolation.pug","end":{"line":11,"column":23}},"val":"attributes.href"}
+{"type":"indent","loc":{"start":{"line":12,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":12,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":12,"column":7},"filename":"/cases/tag.interpolation.pug","end":{"line":12,"column":8}},"val":"a"}
+{"type":"&attributes","loc":{"start":{"line":12,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":12,"column":31}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":13,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":13,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":12}},"val":"img"}
+{"type":"class","loc":{"start":{"line":13,"column":12},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":17}},"val":"icon"}
+{"type":"start-attributes","loc":{"start":{"line":13,"column":17},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":13,"column":18},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":26}},"name":"src","mustEscape":true,"val":"icon"}
+{"type":"end-attributes","loc":{"start":{"line":13,"column":26},"filename":"/cases/tag.interpolation.pug","end":{"line":13,"column":27}}}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":14,"column":9}}}
+{"type":"mixin-block","loc":{"start":{"line":14,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":14,"column":14}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":15,"column":5}}}
+{"type":"outdent","loc":{"start":{"line":15,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":15,"column":5}}}
+{"type":"else","loc":{"start":{"line":15,"column":5},"filename":"/cases/tag.interpolation.pug","end":{"line":15,"column":9}},"val":""}
+{"type":"indent","loc":{"start":{"line":16,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":16,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":16,"column":7},"filename":"/cases/tag.interpolation.pug","end":{"line":16,"column":11}},"val":"span"}
+{"type":"&attributes","loc":{"start":{"line":16,"column":11},"filename":"/cases/tag.interpolation.pug","end":{"line":16,"column":34}},"val":"attributes"}
+{"type":"indent","loc":{"start":{"line":17,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":9}},"val":8}
+{"type":"tag","loc":{"start":{"line":17,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":12}},"val":"img"}
+{"type":"class","loc":{"start":{"line":17,"column":12},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":17}},"val":"icon"}
+{"type":"start-attributes","loc":{"start":{"line":17,"column":17},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":18}}}
+{"type":"attribute","loc":{"start":{"line":17,"column":18},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":26}},"name":"src","mustEscape":true,"val":"icon"}
+{"type":"end-attributes","loc":{"start":{"line":17,"column":26},"filename":"/cases/tag.interpolation.pug","end":{"line":17,"column":27}}}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":18,"column":9}}}
+{"type":"mixin-block","loc":{"start":{"line":18,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":18,"column":14}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":1}}}
+{"type":"tag","loc":{"start":{"line":20,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":20,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":21,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":21,"column":3}},"val":2}
+{"type":"call","loc":{"start":{"line":21,"column":3},"filename":"/cases/tag.interpolation.pug","end":{"line":21,"column":19}},"val":"item","args":"'contact'"}
+{"type":"text","loc":{"start":{"line":21,"column":20},"filename":"/cases/tag.interpolation.pug","end":{"line":21,"column":27}},"val":"Contact"}
+{"type":"newline","loc":{"start":{"line":22,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":3}}}
+{"type":"call","loc":{"start":{"line":22,"column":3},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":8}},"val":"item","args":null}
+{"type":"start-attributes","loc":{"start":{"line":22,"column":8},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":22,"column":9},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":24}},"name":"href","mustEscape":true,"val":"'/contact'"}
+{"type":"end-attributes","loc":{"start":{"line":22,"column":24},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":25}}}
+{"type":"text","loc":{"start":{"line":22,"column":26},"filename":"/cases/tag.interpolation.pug","end":{"line":22,"column":33}},"val":"Contact"}
+{"type":"outdent","loc":{"start":{"line":23,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":23,"column":1}}}
+{"type":"eos","loc":{"start":{"line":23,"column":1},"filename":"/cases/tag.interpolation.pug","end":{"line":23,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/tags.self-closing.tokens.json b/packages/pug-parser/test/cases/tags.self-closing.tokens.json
index 31f573796..adff52082 100644
--- a/packages/pug-parser/test/cases/tags.self-closing.tokens.json
+++ b/packages/pug-parser/test/cases/tags.self-closing.tokens.json
@@ -1,60 +1,60 @@
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"foo"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"foo"}
-{"type":"start-attributes","line":4,"col":6}
-{"type":"attribute","line":4,"col":7,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":16}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"foo"}
-{"type":"slash","line":5,"col":6}
-{"type":"newline","line":6,"col":1}
-{"type":"tag","line":6,"col":3,"val":"foo"}
-{"type":"start-attributes","line":6,"col":6}
-{"type":"attribute","line":6,"col":7,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":16}
-{"type":"slash","line":6,"col":17}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":3,"val":"foo"}
-{"type":"text","line":7,"col":7,"val":"/"}
-{"type":"newline","line":8,"col":1}
-{"type":"tag","line":8,"col":3,"val":"foo"}
-{"type":"start-attributes","line":8,"col":6}
-{"type":"attribute","line":8,"col":7,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":8,"col":16}
-{"type":"text","line":8,"col":18,"val":"/"}
-{"type":"newline","line":9,"col":1}
-{"type":"interpolation","line":9,"col":3,"val":"'foo'"}
-{"type":"slash","line":9,"col":11}
-{"type":"newline","line":10,"col":1}
-{"type":"interpolation","line":10,"col":3,"val":"'foo'"}
-{"type":"start-attributes","line":10,"col":11}
-{"type":"attribute","line":10,"col":12,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":10,"col":21}
-{"type":"slash","line":10,"col":22}
-{"type":"newline","line":11,"col":1}
-{"type":"interpolation","line":11,"col":3,"val":"'foo'"}
-{"type":"text","line":11,"col":12,"val":"/"}
-{"type":"newline","line":12,"col":1}
-{"type":"interpolation","line":12,"col":3,"val":"'foo'"}
-{"type":"start-attributes","line":12,"col":11}
-{"type":"attribute","line":12,"col":12,"name":"bar","val":"'baz'","mustEscape":true}
-{"type":"end-attributes","line":12,"col":21}
-{"type":"text","line":12,"col":23,"val":"/"}
-{"type":"newline","line":13,"col":1}
-{"type":"comment","line":13,"col":3,"val":" can have a single space after them","buffer":false}
-{"type":"newline","line":14,"col":1}
-{"type":"tag","line":14,"col":3,"val":"img"}
-{"type":"text","line":14,"col":6,"val":" "}
-{"type":"newline","line":15,"col":1}
-{"type":"comment","line":15,"col":3,"val":" can have lots of white space after them","buffer":false}
-{"type":"newline","line":16,"col":1}
-{"type":"tag","line":16,"col":3,"val":"img"}
-{"type":"text","line":16,"col":7,"val":"   "}
-{"type":"newline","line":17,"col":1}
-{"type":"interpolation","line":17,"col":3,"val":"\n    'foo'\n  "}
-{"type":"slash","line":19,"col":4}
-{"type":"outdent","line":20,"col":1}
-{"type":"eos","line":20,"col":1}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":2,"column":5}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":3,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":16}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":16},"filename":"/cases/tags.self-closing.pug","end":{"line":4,"column":17}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":5,"column":6}},"val":"foo"}
+{"type":"slash","loc":{"start":{"line":5,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":5,"column":7}}}
+{"type":"newline","loc":{"start":{"line":6,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":3}}}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":16}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":16},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":17}}}
+{"type":"slash","loc":{"start":{"line":6,"column":17},"filename":"/cases/tags.self-closing.pug","end":{"line":6,"column":18}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":7,"column":3}}}
+{"type":"tag","loc":{"start":{"line":7,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":7,"column":6}},"val":"foo"}
+{"type":"text","loc":{"start":{"line":7,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":7,"column":8}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":3}}}
+{"type":"tag","loc":{"start":{"line":8,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":6}},"val":"foo"}
+{"type":"start-attributes","loc":{"start":{"line":8,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":7}}}
+{"type":"attribute","loc":{"start":{"line":8,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":16}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":8,"column":16},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":17}}}
+{"type":"text","loc":{"start":{"line":8,"column":18},"filename":"/cases/tags.self-closing.pug","end":{"line":8,"column":19}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":9,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":9,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":9,"column":11}},"val":"'foo'"}
+{"type":"slash","loc":{"start":{"line":9,"column":11},"filename":"/cases/tags.self-closing.pug","end":{"line":9,"column":12}}}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":10,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":11}},"val":"'foo'"}
+{"type":"start-attributes","loc":{"start":{"line":10,"column":11},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":10,"column":12},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":21}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":10,"column":21},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":22}}}
+{"type":"slash","loc":{"start":{"line":10,"column":22},"filename":"/cases/tags.self-closing.pug","end":{"line":10,"column":23}}}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":11,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":11,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":11,"column":11}},"val":"'foo'"}
+{"type":"text","loc":{"start":{"line":11,"column":12},"filename":"/cases/tags.self-closing.pug","end":{"line":11,"column":13}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":12,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":11}},"val":"'foo'"}
+{"type":"start-attributes","loc":{"start":{"line":12,"column":11},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":12,"column":12},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":21}},"name":"bar","mustEscape":true,"val":"'baz'"}
+{"type":"end-attributes","loc":{"start":{"line":12,"column":21},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":22}}}
+{"type":"text","loc":{"start":{"line":12,"column":23},"filename":"/cases/tags.self-closing.pug","end":{"line":12,"column":24}},"val":"/"}
+{"type":"newline","loc":{"start":{"line":13,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":13,"column":3}}}
+{"type":"comment","loc":{"start":{"line":13,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":13,"column":41}},"val":" can have a single space after them","buffer":false}
+{"type":"newline","loc":{"start":{"line":14,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":14,"column":3}}}
+{"type":"tag","loc":{"start":{"line":14,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":14,"column":6}},"val":"img"}
+{"type":"text","loc":{"start":{"line":14,"column":6},"filename":"/cases/tags.self-closing.pug","end":{"line":14,"column":7}},"val":" "}
+{"type":"newline","loc":{"start":{"line":15,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":15,"column":3}}}
+{"type":"comment","loc":{"start":{"line":15,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":15,"column":46}},"val":" can have lots of white space after them","buffer":false}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":16,"column":3}}}
+{"type":"tag","loc":{"start":{"line":16,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":16,"column":6}},"val":"img"}
+{"type":"text","loc":{"start":{"line":16,"column":7},"filename":"/cases/tags.self-closing.pug","end":{"line":16,"column":10}},"val":"   "}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":17,"column":3}}}
+{"type":"interpolation","loc":{"start":{"line":17,"column":3},"filename":"/cases/tags.self-closing.pug","end":{"line":19,"column":4}},"val":"\n    'foo'\n  "}
+{"type":"slash","loc":{"start":{"line":19,"column":4},"filename":"/cases/tags.self-closing.pug","end":{"line":19,"column":5}}}
+{"type":"outdent","loc":{"start":{"line":20,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":20,"column":1}}}
+{"type":"eos","loc":{"start":{"line":20,"column":1},"filename":"/cases/tags.self-closing.pug","end":{"line":20,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/template.tokens.json b/packages/pug-parser/test/cases/template.tokens.json
index 20a1c4c9b..183caac5b 100644
--- a/packages/pug-parser/test/cases/template.tokens.json
+++ b/packages/pug-parser/test/cases/template.tokens.json
@@ -1,27 +1,27 @@
-{"type":"tag","line":1,"col":1,"val":"script"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":1,"col":30}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"article"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"tag","line":3,"col":5,"val":"h2"}
-{"type":"text","line":3,"col":8,"val":"{{title}}"}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":5,"val":"p"}
-{"type":"text","line":4,"col":7,"val":"{{description}}"}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"tag","line":6,"col":1,"val":"script"}
-{"type":"start-attributes","line":6,"col":7}
-{"type":"attribute","line":6,"col":8,"name":"type","val":"'text/x-template'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":30}
-{"type":"dot","line":6,"col":31}
-{"type":"start-pipeless-text","line":6,"col":32}
-{"type":"text","line":7,"col":3,"val":"article"}
-{"type":"newline","line":8,"col":1}
-{"type":"text","line":8,"col":3,"val":"  h2 {{title}}"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":3,"val":"  p {{description}}"}
-{"type":"end-pipeless-text","line":9,"col":22}
-{"type":"eos","line":9,"col":22}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/template.pug","end":{"line":1,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/template.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/template.pug","end":{"line":1,"column":30}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":30},"filename":"/cases/template.pug","end":{"line":1,"column":31}}}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/template.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/template.pug","end":{"line":2,"column":10}},"val":"article"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/template.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":3,"column":5},"filename":"/cases/template.pug","end":{"line":3,"column":7}},"val":"h2"}
+{"type":"text","loc":{"start":{"line":3,"column":8},"filename":"/cases/template.pug","end":{"line":3,"column":17}},"val":"{{title}}"}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/template.pug","end":{"line":4,"column":5}}}
+{"type":"tag","loc":{"start":{"line":4,"column":5},"filename":"/cases/template.pug","end":{"line":4,"column":6}},"val":"p"}
+{"type":"text","loc":{"start":{"line":4,"column":7},"filename":"/cases/template.pug","end":{"line":4,"column":22}},"val":"{{description}}"}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/template.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/template.pug","end":{"line":6,"column":1}}}
+{"type":"tag","loc":{"start":{"line":6,"column":1},"filename":"/cases/template.pug","end":{"line":6,"column":7}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":7},"filename":"/cases/template.pug","end":{"line":6,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":8},"filename":"/cases/template.pug","end":{"line":6,"column":30}},"name":"type","mustEscape":true,"val":"'text/x-template'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":30},"filename":"/cases/template.pug","end":{"line":6,"column":31}}}
+{"type":"dot","loc":{"start":{"line":6,"column":31},"filename":"/cases/template.pug","end":{"line":6,"column":32}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":6,"column":32},"filename":"/cases/template.pug","end":{"line":6,"column":32}}}
+{"type":"text","loc":{"start":{"line":7,"column":3},"filename":"/cases/template.pug","end":{"line":7,"column":10}},"val":"article"}
+{"type":"newline","loc":{"start":{"line":8,"column":1},"filename":"/cases/template.pug","end":{"line":8,"column":3}}}
+{"type":"text","loc":{"start":{"line":8,"column":3},"filename":"/cases/template.pug","end":{"line":8,"column":17}},"val":"  h2 {{title}}"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/template.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":3},"filename":"/cases/template.pug","end":{"line":9,"column":22}},"val":"  p {{description}}"}
+{"type":"end-pipeless-text","loc":{"start":{"line":9,"column":22},"filename":"/cases/template.pug","end":{"line":9,"column":22}}}
+{"type":"eos","loc":{"start":{"line":9,"column":22},"filename":"/cases/template.pug","end":{"line":9,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/text-block.tokens.json b/packages/pug-parser/test/cases/text-block.tokens.json
index 1c12f99aa..d6d0bdab4 100644
--- a/packages/pug-parser/test/cases/text-block.tokens.json
+++ b/packages/pug-parser/test/cases/text-block.tokens.json
@@ -1,20 +1,20 @@
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"label"}
-{"type":"text","line":2,"col":7,"val":"Username:"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"tag","line":3,"col":3,"val":"input"}
-{"type":"start-attributes","line":3,"col":8}
-{"type":"attribute","line":3,"col":9,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":3,"col":22,"name":"name","val":"'user[name]'","mustEscape":true}
-{"type":"end-attributes","line":3,"col":39}
-{"type":"outdent","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"label"}
-{"type":"text","line":5,"col":7,"val":"Password:"}
-{"type":"indent","line":6,"col":1,"val":2}
-{"type":"tag","line":6,"col":3,"val":"input"}
-{"type":"start-attributes","line":6,"col":8}
-{"type":"attribute","line":6,"col":9,"name":"type","val":"'text'","mustEscape":true}
-{"type":"attribute","line":6,"col":22,"name":"name","val":"'user[pass]'","mustEscape":true}
-{"type":"end-attributes","line":6,"col":39}
-{"type":"outdent","line":6,"col":40}
-{"type":"eos","line":6,"col":40}
\ No newline at end of file
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/text-block.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/text-block.pug","end":{"line":2,"column":6}},"val":"label"}
+{"type":"text","loc":{"start":{"line":2,"column":7},"filename":"/cases/text-block.pug","end":{"line":2,"column":16}},"val":"Username:"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/text-block.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":3,"column":3},"filename":"/cases/text-block.pug","end":{"line":3,"column":8}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":8},"filename":"/cases/text-block.pug","end":{"line":3,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":9},"filename":"/cases/text-block.pug","end":{"line":3,"column":20}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":3,"column":22},"filename":"/cases/text-block.pug","end":{"line":3,"column":39}},"name":"name","mustEscape":true,"val":"'user[name]'"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":39},"filename":"/cases/text-block.pug","end":{"line":3,"column":40}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/text-block.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/text-block.pug","end":{"line":5,"column":6}},"val":"label"}
+{"type":"text","loc":{"start":{"line":5,"column":7},"filename":"/cases/text-block.pug","end":{"line":5,"column":16}},"val":"Password:"}
+{"type":"indent","loc":{"start":{"line":6,"column":1},"filename":"/cases/text-block.pug","end":{"line":6,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":6,"column":3},"filename":"/cases/text-block.pug","end":{"line":6,"column":8}},"val":"input"}
+{"type":"start-attributes","loc":{"start":{"line":6,"column":8},"filename":"/cases/text-block.pug","end":{"line":6,"column":9}}}
+{"type":"attribute","loc":{"start":{"line":6,"column":9},"filename":"/cases/text-block.pug","end":{"line":6,"column":20}},"name":"type","mustEscape":true,"val":"'text'"}
+{"type":"attribute","loc":{"start":{"line":6,"column":22},"filename":"/cases/text-block.pug","end":{"line":6,"column":39}},"name":"name","mustEscape":true,"val":"'user[pass]'"}
+{"type":"end-attributes","loc":{"start":{"line":6,"column":39},"filename":"/cases/text-block.pug","end":{"line":6,"column":40}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":40},"filename":"/cases/text-block.pug","end":{"line":6,"column":40}}}
+{"type":"eos","loc":{"start":{"line":6,"column":40},"filename":"/cases/text-block.pug","end":{"line":6,"column":40}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/text.tokens.json b/packages/pug-parser/test/cases/text.tokens.json
index 50553de04..18d4059fc 100644
--- a/packages/pug-parser/test/cases/text.tokens.json
+++ b/packages/pug-parser/test/cases/text.tokens.json
@@ -1,91 +1,91 @@
-{"type":"tag","line":1,"col":1,"val":"option"}
-{"type":"start-attributes","line":1,"col":7}
-{"type":"attribute","line":1,"col":8,"name":"value","val":"''","mustEscape":true}
-{"type":"end-attributes","line":1,"col":16}
-{"type":"text","line":1,"col":18,"val":"-- (selected) --"}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"p"}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":1,"val":"p"}
-{"type":"dot","line":5,"col":2}
-{"type":"newline","line":7,"col":1}
-{"type":"tag","line":7,"col":1,"val":"p"}
-{"type":"indent","line":8,"col":1,"val":2}
-{"type":"text","line":8,"col":5,"val":"foo"}
-{"type":"newline","line":9,"col":1}
-{"type":"text","line":9,"col":5,"val":"bar"}
-{"type":"newline","line":10,"col":1}
-{"type":"text","line":10,"col":5,"val":"baz"}
-{"type":"outdent","line":12,"col":1}
-{"type":"tag","line":12,"col":1,"val":"p"}
-{"type":"dot","line":12,"col":2}
-{"type":"start-pipeless-text","line":12,"col":3}
-{"type":"text","line":13,"col":3,"val":"foo"}
-{"type":"newline","line":14,"col":1}
-{"type":"text","line":14,"col":3,"val":""}
-{"type":"newline","line":15,"col":1}
-{"type":"text","line":15,"col":3,"val":""}
-{"type":"newline","line":16,"col":1}
-{"type":"text","line":16,"col":3,"val":"bar"}
-{"type":"newline","line":17,"col":1}
-{"type":"text","line":17,"col":3,"val":"baz"}
-{"type":"newline","line":18,"col":1}
-{"type":"text","line":18,"col":3,"val":""}
-{"type":"end-pipeless-text","line":18,"col":3}
-{"type":"newline","line":19,"col":1}
-{"type":"dot","line":19,"col":1}
-{"type":"newline","line":21,"col":1}
-{"type":"dot","line":21,"col":1}
-{"type":"start-pipeless-text","line":21,"col":2}
-{"type":"text","line":22,"col":3,"val":"foo"}
-{"type":"newline","line":23,"col":1}
-{"type":"text","line":23,"col":3,"val":""}
-{"type":"newline","line":24,"col":1}
-{"type":"text","line":24,"col":3,"val":""}
-{"type":"newline","line":25,"col":1}
-{"type":"text","line":25,"col":3,"val":"bar"}
-{"type":"newline","line":26,"col":1}
-{"type":"text","line":26,"col":3,"val":"baz"}
-{"type":"newline","line":27,"col":1}
-{"type":"text","line":27,"col":3,"val":""}
-{"type":"end-pipeless-text","line":27,"col":3}
-{"type":"newline","line":28,"col":1}
-{"type":"tag","line":28,"col":1,"val":"pre"}
-{"type":"indent","line":29,"col":1,"val":2}
-{"type":"text","line":29,"col":5,"val":"foo"}
-{"type":"newline","line":30,"col":1}
-{"type":"text","line":30,"col":5,"val":"  bar"}
-{"type":"newline","line":31,"col":1}
-{"type":"text","line":31,"col":5,"val":"    baz"}
-{"type":"newline","line":32,"col":1}
-{"type":"text","line":32,"col":5,"val":"."}
-{"type":"outdent","line":34,"col":1}
-{"type":"tag","line":34,"col":1,"val":"pre"}
-{"type":"dot","line":34,"col":4}
-{"type":"start-pipeless-text","line":34,"col":5}
-{"type":"text","line":35,"col":3,"val":"foo"}
-{"type":"newline","line":36,"col":1}
-{"type":"text","line":36,"col":3,"val":"  bar"}
-{"type":"newline","line":37,"col":1}
-{"type":"text","line":37,"col":3,"val":"    baz"}
-{"type":"newline","line":38,"col":1}
-{"type":"text","line":38,"col":3,"val":"."}
-{"type":"newline","line":39,"col":1}
-{"type":"text","line":39,"col":3,"val":""}
-{"type":"end-pipeless-text","line":39,"col":3}
-{"type":"newline","line":40,"col":1}
-{"type":"dot","line":40,"col":1}
-{"type":"start-pipeless-text","line":40,"col":2}
-{"type":"text","line":41,"col":3,"val":"foo"}
-{"type":"newline","line":42,"col":1}
-{"type":"text","line":42,"col":3,"val":"  bar"}
-{"type":"newline","line":43,"col":1}
-{"type":"text","line":43,"col":3,"val":"    baz"}
-{"type":"newline","line":44,"col":1}
-{"type":"text","line":44,"col":3,"val":"."}
-{"type":"end-pipeless-text","line":44,"col":4}
-{"type":"newline","line":45,"col": 1}
-{"type":"text","line":45,"col": 3,"val":"foo"}
-{"type":"newline","line":46,"col": 1}
-{"type":"interpolated-code","line":46,"col":3,"val":"bar","mustEscape":true,"buffer":true}
-{"type":"eos","line":46,"col":9}
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/text.pug","end":{"line":1,"column":7}},"val":"option"}
+{"type":"start-attributes","loc":{"start":{"line":1,"column":7},"filename":"/cases/text.pug","end":{"line":1,"column":8}}}
+{"type":"attribute","loc":{"start":{"line":1,"column":8},"filename":"/cases/text.pug","end":{"line":1,"column":16}},"name":"value","mustEscape":true,"val":"''"}
+{"type":"end-attributes","loc":{"start":{"line":1,"column":16},"filename":"/cases/text.pug","end":{"line":1,"column":17}}}
+{"type":"text","loc":{"start":{"line":1,"column":18},"filename":"/cases/text.pug","end":{"line":1,"column":34}},"val":"-- (selected) --"}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/text.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/text.pug","end":{"line":3,"column":2}},"val":"p"}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/text.pug","end":{"line":5,"column":1}}}
+{"type":"tag","loc":{"start":{"line":5,"column":1},"filename":"/cases/text.pug","end":{"line":5,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":5,"column":2},"filename":"/cases/text.pug","end":{"line":5,"column":3}}}
+{"type":"newline","loc":{"start":{"line":7,"column":1},"filename":"/cases/text.pug","end":{"line":7,"column":1}}}
+{"type":"tag","loc":{"start":{"line":7,"column":1},"filename":"/cases/text.pug","end":{"line":7,"column":2}},"val":"p"}
+{"type":"indent","loc":{"start":{"line":8,"column":1},"filename":"/cases/text.pug","end":{"line":8,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":8,"column":5},"filename":"/cases/text.pug","end":{"line":8,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":9,"column":1},"filename":"/cases/text.pug","end":{"line":9,"column":3}}}
+{"type":"text","loc":{"start":{"line":9,"column":5},"filename":"/cases/text.pug","end":{"line":9,"column":8}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":10,"column":1},"filename":"/cases/text.pug","end":{"line":10,"column":3}}}
+{"type":"text","loc":{"start":{"line":10,"column":4},"filename":"/cases/text.pug","end":{"line":10,"column":4}},"val":""}
+{"type":"newline","loc":{"start":{"line":11,"column":1},"filename":"/cases/text.pug","end":{"line":11,"column":3}}}
+{"type":"text","loc":{"start":{"line":11,"column":4},"filename":"/cases/text.pug","end":{"line":11,"column":5}},"val":" "}
+{"type":"newline","loc":{"start":{"line":12,"column":1},"filename":"/cases/text.pug","end":{"line":12,"column":3}}}
+{"type":"text","loc":{"start":{"line":12,"column":5},"filename":"/cases/text.pug","end":{"line":12,"column":8}},"val":"baz"}
+{"type":"outdent","loc":{"start":{"line":14,"column":1},"filename":"/cases/text.pug","end":{"line":14,"column":1}}}
+{"type":"tag","loc":{"start":{"line":14,"column":1},"filename":"/cases/text.pug","end":{"line":14,"column":2}},"val":"p"}
+{"type":"dot","loc":{"start":{"line":14,"column":2},"filename":"/cases/text.pug","end":{"line":14,"column":3}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":14,"column":3},"filename":"/cases/text.pug","end":{"line":14,"column":3}}}
+{"type":"text","loc":{"start":{"line":15,"column":3},"filename":"/cases/text.pug","end":{"line":15,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":16,"column":1},"filename":"/cases/text.pug","end":{"line":16,"column":1}}}
+{"type":"text","loc":{"start":{"line":16,"column":1},"filename":"/cases/text.pug","end":{"line":16,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":17,"column":1},"filename":"/cases/text.pug","end":{"line":17,"column":1}}}
+{"type":"text","loc":{"start":{"line":17,"column":1},"filename":"/cases/text.pug","end":{"line":17,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":18,"column":1},"filename":"/cases/text.pug","end":{"line":18,"column":3}}}
+{"type":"text","loc":{"start":{"line":18,"column":3},"filename":"/cases/text.pug","end":{"line":18,"column":6}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":19,"column":1},"filename":"/cases/text.pug","end":{"line":19,"column":3}}}
+{"type":"text","loc":{"start":{"line":19,"column":3},"filename":"/cases/text.pug","end":{"line":19,"column":6}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":20,"column":1},"filename":"/cases/text.pug","end":{"line":20,"column":1}}}
+{"type":"text","loc":{"start":{"line":20,"column":1},"filename":"/cases/text.pug","end":{"line":20,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":20,"column":1},"filename":"/cases/text.pug","end":{"line":20,"column":1}}}
+{"type":"newline","loc":{"start":{"line":21,"column":1},"filename":"/cases/text.pug","end":{"line":21,"column":1}}}
+{"type":"dot","loc":{"start":{"line":21,"column":1},"filename":"/cases/text.pug","end":{"line":21,"column":2}}}
+{"type":"newline","loc":{"start":{"line":23,"column":1},"filename":"/cases/text.pug","end":{"line":23,"column":1}}}
+{"type":"dot","loc":{"start":{"line":23,"column":1},"filename":"/cases/text.pug","end":{"line":23,"column":2}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":23,"column":2},"filename":"/cases/text.pug","end":{"line":23,"column":2}}}
+{"type":"text","loc":{"start":{"line":24,"column":3},"filename":"/cases/text.pug","end":{"line":24,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":25,"column":1},"filename":"/cases/text.pug","end":{"line":25,"column":1}}}
+{"type":"text","loc":{"start":{"line":25,"column":1},"filename":"/cases/text.pug","end":{"line":25,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":26,"column":1},"filename":"/cases/text.pug","end":{"line":26,"column":1}}}
+{"type":"text","loc":{"start":{"line":26,"column":1},"filename":"/cases/text.pug","end":{"line":26,"column":1}},"val":""}
+{"type":"newline","loc":{"start":{"line":27,"column":1},"filename":"/cases/text.pug","end":{"line":27,"column":3}}}
+{"type":"text","loc":{"start":{"line":27,"column":3},"filename":"/cases/text.pug","end":{"line":27,"column":6}},"val":"bar"}
+{"type":"newline","loc":{"start":{"line":28,"column":1},"filename":"/cases/text.pug","end":{"line":28,"column":3}}}
+{"type":"text","loc":{"start":{"line":28,"column":3},"filename":"/cases/text.pug","end":{"line":28,"column":6}},"val":"baz"}
+{"type":"newline","loc":{"start":{"line":29,"column":1},"filename":"/cases/text.pug","end":{"line":29,"column":1}}}
+{"type":"text","loc":{"start":{"line":29,"column":1},"filename":"/cases/text.pug","end":{"line":29,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":29,"column":1},"filename":"/cases/text.pug","end":{"line":29,"column":1}}}
+{"type":"newline","loc":{"start":{"line":30,"column":1},"filename":"/cases/text.pug","end":{"line":30,"column":1}}}
+{"type":"tag","loc":{"start":{"line":30,"column":1},"filename":"/cases/text.pug","end":{"line":30,"column":4}},"val":"pre"}
+{"type":"indent","loc":{"start":{"line":31,"column":1},"filename":"/cases/text.pug","end":{"line":31,"column":3}},"val":2}
+{"type":"text","loc":{"start":{"line":31,"column":5},"filename":"/cases/text.pug","end":{"line":31,"column":8}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":32,"column":1},"filename":"/cases/text.pug","end":{"line":32,"column":3}}}
+{"type":"text","loc":{"start":{"line":32,"column":5},"filename":"/cases/text.pug","end":{"line":32,"column":10}},"val":"  bar"}
+{"type":"newline","loc":{"start":{"line":33,"column":1},"filename":"/cases/text.pug","end":{"line":33,"column":3}}}
+{"type":"text","loc":{"start":{"line":33,"column":5},"filename":"/cases/text.pug","end":{"line":33,"column":12}},"val":"    baz"}
+{"type":"newline","loc":{"start":{"line":34,"column":1},"filename":"/cases/text.pug","end":{"line":34,"column":3}}}
+{"type":"text","loc":{"start":{"line":34,"column":5},"filename":"/cases/text.pug","end":{"line":34,"column":6}},"val":"."}
+{"type":"outdent","loc":{"start":{"line":36,"column":1},"filename":"/cases/text.pug","end":{"line":36,"column":1}}}
+{"type":"tag","loc":{"start":{"line":36,"column":1},"filename":"/cases/text.pug","end":{"line":36,"column":4}},"val":"pre"}
+{"type":"dot","loc":{"start":{"line":36,"column":4},"filename":"/cases/text.pug","end":{"line":36,"column":5}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":36,"column":5},"filename":"/cases/text.pug","end":{"line":36,"column":5}}}
+{"type":"text","loc":{"start":{"line":37,"column":3},"filename":"/cases/text.pug","end":{"line":37,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":38,"column":1},"filename":"/cases/text.pug","end":{"line":38,"column":3}}}
+{"type":"text","loc":{"start":{"line":38,"column":3},"filename":"/cases/text.pug","end":{"line":38,"column":8}},"val":"  bar"}
+{"type":"newline","loc":{"start":{"line":39,"column":1},"filename":"/cases/text.pug","end":{"line":39,"column":3}}}
+{"type":"text","loc":{"start":{"line":39,"column":3},"filename":"/cases/text.pug","end":{"line":39,"column":10}},"val":"    baz"}
+{"type":"newline","loc":{"start":{"line":40,"column":1},"filename":"/cases/text.pug","end":{"line":40,"column":3}}}
+{"type":"text","loc":{"start":{"line":40,"column":3},"filename":"/cases/text.pug","end":{"line":40,"column":4}},"val":"."}
+{"type":"newline","loc":{"start":{"line":41,"column":1},"filename":"/cases/text.pug","end":{"line":41,"column":1}}}
+{"type":"text","loc":{"start":{"line":41,"column":1},"filename":"/cases/text.pug","end":{"line":41,"column":1}},"val":""}
+{"type":"end-pipeless-text","loc":{"start":{"line":41,"column":1},"filename":"/cases/text.pug","end":{"line":41,"column":1}}}
+{"type":"newline","loc":{"start":{"line":42,"column":1},"filename":"/cases/text.pug","end":{"line":42,"column":1}}}
+{"type":"dot","loc":{"start":{"line":42,"column":1},"filename":"/cases/text.pug","end":{"line":42,"column":2}}}
+{"type":"start-pipeless-text","loc":{"start":{"line":42,"column":2},"filename":"/cases/text.pug","end":{"line":42,"column":2}}}
+{"type":"text","loc":{"start":{"line":43,"column":3},"filename":"/cases/text.pug","end":{"line":43,"column":6}},"val":"foo"}
+{"type":"newline","loc":{"start":{"line":44,"column":1},"filename":"/cases/text.pug","end":{"line":44,"column":3}}}
+{"type":"text","loc":{"start":{"line":44,"column":3},"filename":"/cases/text.pug","end":{"line":44,"column":8}},"val":"  bar"}
+{"type":"newline","loc":{"start":{"line":45,"column":1},"filename":"/cases/text.pug","end":{"line":45,"column":3}}}
+{"type":"text","loc":{"start":{"line":45,"column":3},"filename":"/cases/text.pug","end":{"line":45,"column":10}},"val":"    baz"}
+{"type":"newline","loc":{"start":{"line":46,"column":1},"filename":"/cases/text.pug","end":{"line":46,"column":3}}}
+{"type":"text","loc":{"start":{"line":46,"column":3},"filename":"/cases/text.pug","end":{"line":46,"column":4}},"val":"."}
+{"type":"end-pipeless-text","loc":{"start":{"line":46,"column":4},"filename":"/cases/text.pug","end":{"line":46,"column":4}}}
+{"type":"eos","loc":{"start":{"line":46,"column":4},"filename":"/cases/text.pug","end":{"line":46,"column":4}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/utf8bom.tokens.json b/packages/pug-parser/test/cases/utf8bom.tokens.json
index 50680b7bf..02ea7b4eb 100644
--- a/packages/pug-parser/test/cases/utf8bom.tokens.json
+++ b/packages/pug-parser/test/cases/utf8bom.tokens.json
@@ -1,4 +1,4 @@
-{"type":"tag","line":1,"col":1,"val":"p"}
-{"type":"text","line":1,"col":3,"val":"\"foo\""}
-{"type":"newline","line":2,"col":1}
-{"type":"eos","line":2,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/utf8bom.pug","end":{"line":1,"column":2}},"val":"p"}
+{"type":"text","loc":{"start":{"line":1,"column":3},"filename":"/cases/utf8bom.pug","end":{"line":1,"column":8}},"val":"\"foo\""}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/utf8bom.pug","end":{"line":2,"column":1}}}
+{"type":"eos","loc":{"start":{"line":2,"column":1},"filename":"/cases/utf8bom.pug","end":{"line":2,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/vars.tokens.json b/packages/pug-parser/test/cases/vars.tokens.json
index e9ba1e825..6e145a162 100644
--- a/packages/pug-parser/test/cases/vars.tokens.json
+++ b/packages/pug-parser/test/cases/vars.tokens.json
@@ -1,10 +1,10 @@
-{"type":"code","line":1,"col":1,"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"code","line":2,"col":1,"val":"var list = [1,2,3]","mustEscape":false,"buffer":false}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"a"}
-{"type":"start-attributes","line":3,"col":2}
-{"type":"attribute","line":3,"col":3,"name":"class","val":"list","mustEscape":true}
-{"type":"attribute","line":3,"col":15,"name":"id","val":"foo","mustEscape":true}
-{"type":"end-attributes","line":3,"col":21}
-{"type":"eos","line":3,"col":22}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/vars.pug","end":{"line":1,"column":18}},"val":"var foo = 'bar'","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/vars.pug","end":{"line":2,"column":1}}}
+{"type":"code","loc":{"start":{"line":2,"column":1},"filename":"/cases/vars.pug","end":{"line":2,"column":21}},"val":"var list = [1,2,3]","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/vars.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/vars.pug","end":{"line":3,"column":2}},"val":"a"}
+{"type":"start-attributes","loc":{"start":{"line":3,"column":2},"filename":"/cases/vars.pug","end":{"line":3,"column":3}}}
+{"type":"attribute","loc":{"start":{"line":3,"column":3},"filename":"/cases/vars.pug","end":{"line":3,"column":13}},"name":"class","mustEscape":true,"val":"list"}
+{"type":"attribute","loc":{"start":{"line":3,"column":15},"filename":"/cases/vars.pug","end":{"line":3,"column":21}},"name":"id","mustEscape":true,"val":"foo"}
+{"type":"end-attributes","loc":{"start":{"line":3,"column":21},"filename":"/cases/vars.pug","end":{"line":3,"column":22}}}
+{"type":"eos","loc":{"start":{"line":3,"column":22},"filename":"/cases/vars.pug","end":{"line":3,"column":22}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/while.tokens.json b/packages/pug-parser/test/cases/while.tokens.json
index d3ded85a7..72a10293f 100644
--- a/packages/pug-parser/test/cases/while.tokens.json
+++ b/packages/pug-parser/test/cases/while.tokens.json
@@ -1,13 +1,13 @@
-{"type":"code","line":1,"col":1,"val":"var x = 1;","mustEscape":false,"buffer":false}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"ul"}
-{"type":"indent","line":3,"col":1,"val":2}
-{"type":"while","line":3,"col":3,"val":"x < 10"}
-{"type":"indent","line":4,"col":1,"val":4}
-{"type":"code","line":4,"col":5,"val":"x++;","mustEscape":false,"buffer":false}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":5,"val":"li"}
-{"type":"code","line":5,"col":7,"val":"x","mustEscape":true,"buffer":true}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"code","loc":{"start":{"line":1,"column":1},"filename":"/cases/while.pug","end":{"line":1,"column":13}},"val":"var x = 1;","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/while.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/while.pug","end":{"line":2,"column":3}},"val":"ul"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/while.pug","end":{"line":3,"column":3}},"val":2}
+{"type":"while","loc":{"start":{"line":3,"column":3},"filename":"/cases/while.pug","end":{"line":3,"column":15}},"val":"x < 10"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/while.pug","end":{"line":4,"column":5}},"val":4}
+{"type":"code","loc":{"start":{"line":4,"column":5},"filename":"/cases/while.pug","end":{"line":4,"column":11}},"val":"x++;","mustEscape":false,"buffer":false}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/while.pug","end":{"line":5,"column":5}}}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/while.pug","end":{"line":5,"column":7}},"val":"li"}
+{"type":"code","loc":{"start":{"line":5,"column":7},"filename":"/cases/while.pug","end":{"line":5,"column":10}},"val":"x","mustEscape":true,"buffer":true}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/while.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/while.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/while.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/xml.tokens.json b/packages/pug-parser/test/cases/xml.tokens.json
index 10d93c83e..444a826e5 100644
--- a/packages/pug-parser/test/cases/xml.tokens.json
+++ b/packages/pug-parser/test/cases/xml.tokens.json
@@ -1,11 +1,11 @@
-{"type":"doctype","line":1,"col":1,"val":"xml"}
-{"type":"newline","line":2,"col":1}
-{"type":"tag","line":2,"col":1,"val":"category"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"term","val":"'some term'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":26}
-{"type":"slash","line":2,"col":27}
-{"type":"newline","line":3,"col":1}
-{"type":"tag","line":3,"col":1,"val":"link"}
-{"type":"text","line":3,"col":6,"val":"http://google.com"}
-{"type":"eos","line":3,"col":23}
\ No newline at end of file
+{"type":"doctype","loc":{"start":{"line":1,"column":1},"filename":"/cases/xml.pug","end":{"line":1,"column":12}},"val":"xml"}
+{"type":"newline","loc":{"start":{"line":2,"column":1},"filename":"/cases/xml.pug","end":{"line":2,"column":1}}}
+{"type":"tag","loc":{"start":{"line":2,"column":1},"filename":"/cases/xml.pug","end":{"line":2,"column":9}},"val":"category"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/xml.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/xml.pug","end":{"line":2,"column":26}},"name":"term","mustEscape":true,"val":"'some term'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":26},"filename":"/cases/xml.pug","end":{"line":2,"column":27}}}
+{"type":"slash","loc":{"start":{"line":2,"column":27},"filename":"/cases/xml.pug","end":{"line":2,"column":28}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/xml.pug","end":{"line":3,"column":1}}}
+{"type":"tag","loc":{"start":{"line":3,"column":1},"filename":"/cases/xml.pug","end":{"line":3,"column":5}},"val":"link"}
+{"type":"text","loc":{"start":{"line":3,"column":6},"filename":"/cases/xml.pug","end":{"line":3,"column":23}},"val":"http://google.com"}
+{"type":"eos","loc":{"start":{"line":3,"column":23},"filename":"/cases/xml.pug","end":{"line":3,"column":23}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json b/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json
index d105fc83b..12c29b879 100644
--- a/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json
+++ b/packages/pug-parser/test/cases/yield-before-conditional-head.tokens.json
@@ -1,18 +1,18 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"script"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"src","val":"'/jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":26}
-{"type":"newline","line":3,"col":1}
-{"type":"yield","line":3,"col":3}
-{"type":"newline","line":4,"col":1}
-{"type":"if","line":4,"col":3,"val":"false"}
-{"type":"indent","line":5,"col":1,"val":4}
-{"type":"tag","line":5,"col":5,"val":"script"}
-{"type":"start-attributes","line":5,"col":11}
-{"type":"attribute","line":5,"col":12,"name":"src","val":"'/jquery.ui.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":31}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":26}},"name":"src","mustEscape":true,"val":"'/jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":26},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":2,"column":27}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":3,"column":3}}}
+{"type":"yield","loc":{"start":{"line":3,"column":3},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":3,"column":8}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":4,"column":3}}}
+{"type":"if","loc":{"start":{"line":4,"column":3},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":4,"column":11}},"val":"false"}
+{"type":"indent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":5}},"val":4}
+{"type":"tag","loc":{"start":{"line":5,"column":5},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":11}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":11},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":12}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":12},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":31}},"name":"src","mustEscape":true,"val":"'/jquery.ui.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":31},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":5,"column":32}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional-head.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-before-conditional.tokens.json b/packages/pug-parser/test/cases/yield-before-conditional.tokens.json
index 446087f14..c09c3b3a0 100644
--- a/packages/pug-parser/test/cases/yield-before-conditional.tokens.json
+++ b/packages/pug-parser/test/cases/yield-before-conditional.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"yield-before-conditional-head.pug"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"script"}
-{"type":"start-attributes","line":4,"col":13}
-{"type":"attribute","line":4,"col":14,"name":"src","val":"'/caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":31}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":7,"val":"script"}
-{"type":"start-attributes","line":5,"col":13}
-{"type":"attribute","line":5,"col":14,"name":"src","val":"'/app.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":27}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-before-conditional.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield-before-conditional.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/yield-before-conditional.pug","end":{"line":3,"column":46}},"val":"yield-before-conditional-head.pug"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":13},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":14},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":31}},"name":"src","mustEscape":true,"val":"'/caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":31},"filename":"/cases/yield-before-conditional.pug","end":{"line":4,"column":32}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":7}}}
+{"type":"tag","loc":{"start":{"line":5,"column":7},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":13},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":14},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":27}},"name":"src","mustEscape":true,"val":"'/app.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":27},"filename":"/cases/yield-before-conditional.pug","end":{"line":5,"column":28}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-before-conditional.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-head.tokens.json b/packages/pug-parser/test/cases/yield-head.tokens.json
index f443372ef..e70fba79f 100644
--- a/packages/pug-parser/test/cases/yield-head.tokens.json
+++ b/packages/pug-parser/test/cases/yield-head.tokens.json
@@ -1,15 +1,15 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"script"}
-{"type":"start-attributes","line":2,"col":9}
-{"type":"attribute","line":2,"col":10,"name":"src","val":"'/jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":2,"col":26}
-{"type":"newline","line":3,"col":1}
-{"type":"yield","line":3,"col":3}
-{"type":"newline","line":4,"col":1}
-{"type":"tag","line":4,"col":3,"val":"script"}
-{"type":"start-attributes","line":4,"col":9}
-{"type":"attribute","line":4,"col":10,"name":"src","val":"'/jquery.ui.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":29}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-head.pug","end":{"line":2,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":2,"column":9},"filename":"/cases/yield-head.pug","end":{"line":2,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":2,"column":10},"filename":"/cases/yield-head.pug","end":{"line":2,"column":26}},"name":"src","mustEscape":true,"val":"'/jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":2,"column":26},"filename":"/cases/yield-head.pug","end":{"line":2,"column":27}}}
+{"type":"newline","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-head.pug","end":{"line":3,"column":3}}}
+{"type":"yield","loc":{"start":{"line":3,"column":3},"filename":"/cases/yield-head.pug","end":{"line":3,"column":8}}}
+{"type":"newline","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-head.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/yield-head.pug","end":{"line":4,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":9},"filename":"/cases/yield-head.pug","end":{"line":4,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":10},"filename":"/cases/yield-head.pug","end":{"line":4,"column":29}},"name":"src","mustEscape":true,"val":"'/jquery.ui.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":29},"filename":"/cases/yield-head.pug","end":{"line":4,"column":30}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-head.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-head.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-title-head.tokens.json b/packages/pug-parser/test/cases/yield-title-head.tokens.json
index 4736bc0c7..5c41eb490 100644
--- a/packages/pug-parser/test/cases/yield-title-head.tokens.json
+++ b/packages/pug-parser/test/cases/yield-title-head.tokens.json
@@ -1,17 +1,17 @@
-{"type":"tag","line":1,"col":1,"val":"head"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"title"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"yield","line":3,"col":5}
-{"type":"outdent","line":4,"col":3}
-{"type":"tag","line":4,"col":3,"val":"script"}
-{"type":"start-attributes","line":4,"col":9}
-{"type":"attribute","line":4,"col":10,"name":"src","val":"'/jquery.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":26}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":3,"val":"script"}
-{"type":"start-attributes","line":5,"col":9}
-{"type":"attribute","line":5,"col":10,"name":"src","val":"'/jquery.ui.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":29}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":1,"column":5}},"val":"head"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-title-head.pug","end":{"line":2,"column":8}},"val":"title"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"yield","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield-title-head.pug","end":{"line":3,"column":10}}}
+{"type":"outdent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":3}}}
+{"type":"tag","loc":{"start":{"line":4,"column":3},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":9},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":10},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":26}},"name":"src","mustEscape":true,"val":"'/jquery.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":26},"filename":"/cases/yield-title-head.pug","end":{"line":4,"column":27}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":3}}}
+{"type":"tag","loc":{"start":{"line":5,"column":3},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":9}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":9},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":10}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":10},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":29}},"name":"src","mustEscape":true,"val":"'/jquery.ui.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":29},"filename":"/cases/yield-title-head.pug","end":{"line":5,"column":30}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield-title-head.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield-title.tokens.json b/packages/pug-parser/test/cases/yield-title.tokens.json
index d8ab522ca..bfba33371 100644
--- a/packages/pug-parser/test/cases/yield-title.tokens.json
+++ b/packages/pug-parser/test/cases/yield-title.tokens.json
@@ -1,12 +1,12 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"yield-title-head.pug"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"text","line":4,"col":9,"val":"My Title"}
-{"type":"outdent","line":5,"col":5}
-{"type":"outdent","line":5,"col":3}
-{"type":"outdent","line":5,"col":1}
-{"type":"eos","line":5,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield-title.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield-title.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield-title.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield-title.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield-title.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/yield-title.pug","end":{"line":3,"column":33}},"val":"yield-title-head.pug"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield-title.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"text","loc":{"start":{"line":4,"column":9},"filename":"/cases/yield-title.pug","end":{"line":4,"column":17}},"val":"My Title"}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
+{"type":"eos","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield-title.pug","end":{"line":5,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug-parser/test/cases/yield.tokens.json b/packages/pug-parser/test/cases/yield.tokens.json
index 9240a0193..26e546499 100644
--- a/packages/pug-parser/test/cases/yield.tokens.json
+++ b/packages/pug-parser/test/cases/yield.tokens.json
@@ -1,20 +1,20 @@
-{"type":"tag","line":1,"col":1,"val":"html"}
-{"type":"indent","line":2,"col":1,"val":2}
-{"type":"tag","line":2,"col":3,"val":"body"}
-{"type":"indent","line":3,"col":1,"val":4}
-{"type":"include","line":3,"col":5}
-{"type":"path","line":3,"col":13,"val":"yield-head.pug"}
-{"type":"indent","line":4,"col":1,"val":6}
-{"type":"tag","line":4,"col":7,"val":"script"}
-{"type":"start-attributes","line":4,"col":13}
-{"type":"attribute","line":4,"col":14,"name":"src","val":"'/caustic.js'","mustEscape":true}
-{"type":"end-attributes","line":4,"col":31}
-{"type":"newline","line":5,"col":1}
-{"type":"tag","line":5,"col":7,"val":"script"}
-{"type":"start-attributes","line":5,"col":13}
-{"type":"attribute","line":5,"col":14,"name":"src","val":"'/app.js'","mustEscape":true}
-{"type":"end-attributes","line":5,"col":27}
-{"type":"outdent","line":6,"col":5}
-{"type":"outdent","line":6,"col":3}
-{"type":"outdent","line":6,"col":1}
-{"type":"eos","line":6,"col":1}
\ No newline at end of file
+{"type":"tag","loc":{"start":{"line":1,"column":1},"filename":"/cases/yield.pug","end":{"line":1,"column":5}},"val":"html"}
+{"type":"indent","loc":{"start":{"line":2,"column":1},"filename":"/cases/yield.pug","end":{"line":2,"column":3}},"val":2}
+{"type":"tag","loc":{"start":{"line":2,"column":3},"filename":"/cases/yield.pug","end":{"line":2,"column":7}},"val":"body"}
+{"type":"indent","loc":{"start":{"line":3,"column":1},"filename":"/cases/yield.pug","end":{"line":3,"column":5}},"val":4}
+{"type":"include","loc":{"start":{"line":3,"column":5},"filename":"/cases/yield.pug","end":{"line":3,"column":12}}}
+{"type":"path","loc":{"start":{"line":3,"column":13},"filename":"/cases/yield.pug","end":{"line":3,"column":27}},"val":"yield-head.pug"}
+{"type":"indent","loc":{"start":{"line":4,"column":1},"filename":"/cases/yield.pug","end":{"line":4,"column":7}},"val":6}
+{"type":"tag","loc":{"start":{"line":4,"column":7},"filename":"/cases/yield.pug","end":{"line":4,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":4,"column":13},"filename":"/cases/yield.pug","end":{"line":4,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":4,"column":14},"filename":"/cases/yield.pug","end":{"line":4,"column":31}},"name":"src","mustEscape":true,"val":"'/caustic.js'"}
+{"type":"end-attributes","loc":{"start":{"line":4,"column":31},"filename":"/cases/yield.pug","end":{"line":4,"column":32}}}
+{"type":"newline","loc":{"start":{"line":5,"column":1},"filename":"/cases/yield.pug","end":{"line":5,"column":7}}}
+{"type":"tag","loc":{"start":{"line":5,"column":7},"filename":"/cases/yield.pug","end":{"line":5,"column":13}},"val":"script"}
+{"type":"start-attributes","loc":{"start":{"line":5,"column":13},"filename":"/cases/yield.pug","end":{"line":5,"column":14}}}
+{"type":"attribute","loc":{"start":{"line":5,"column":14},"filename":"/cases/yield.pug","end":{"line":5,"column":27}},"name":"src","mustEscape":true,"val":"'/app.js'"}
+{"type":"end-attributes","loc":{"start":{"line":5,"column":27},"filename":"/cases/yield.pug","end":{"line":5,"column":28}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
+{"type":"outdent","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
+{"type":"eos","loc":{"start":{"line":6,"column":1},"filename":"/cases/yield.pug","end":{"line":6,"column":1}}}
\ No newline at end of file
diff --git a/packages/pug/lib/index.js b/packages/pug/lib/index.js
index a3c8968a5..36b40f64d 100644
--- a/packages/pug/lib/index.js
+++ b/packages/pug/lib/index.js
@@ -103,8 +103,7 @@ function compileBody(str, options){
         if (token.type === 'path' && path.extname(token.val) === '') {
           return {
             type: 'path',
-            line: token.line,
-            col: token.col,
+            loc: token.loc,
             val: token.val + '.pug'
           };
         }

From aebb1870313a50a4738045df5b916192a4a8d758 Mon Sep 17 00:00:00 2001
From: Marcelo Lopes Lotufo <marcelo.lopes.lotufo@gmail.com>
Date: Mon, 19 Feb 2018 07:30:08 -0300
Subject: [PATCH 41/96] Trailing semicolon (#2962)

* Only put trailing semicolon when merging style attributes

This is a first draft that tries to maintain the same code behavior
without worrying too much about the code quality

* Update tests so they reflect the new code behavior

All style attributes that received a String won't generate
a trailing semicolon

* Improve merge trailing semicolon code

Check if String is not empty by checking if it its true ('' is false)
Get last character of the string using slice(-1)
Add semicolon if the last string character is not a semicolon

* Use array style indexing instead of `.slice` to get last character
---
 packages/pug-runtime/index.js             |  7 +++----
 packages/pug-runtime/test/index.test.js   |  2 +-
 packages/pug/test/cases-es2015/attr.html  |  2 +-
 packages/pug/test/cases/styles.html       |  6 +++---
 packages/pug/test/output-es2015/attr.html |  2 +-
 packages/pug/test/pug.test.js             | 12 ++++++------
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/pug-runtime/index.js b/packages/pug-runtime/index.js
index 4d1bdbee0..d506ddb28 100644
--- a/packages/pug-runtime/index.js
+++ b/packages/pug-runtime/index.js
@@ -30,7 +30,9 @@ function pug_merge(a, b) {
       a[key] = (Array.isArray(valA) ? valA : [valA]).concat(b[key] || []);
     } else if (key === 'style') {
       var valA = pug_style(a[key]);
+      valA = valA && valA[valA.length - 1] !== ';' ? valA + ';' : valA;
       var valB = pug_style(b[key]);
+      valB = valB && valB[valB.length - 1] !== ';' ? valB + ';' : valB;
       a[key] = valA + valB;
     } else {
       a[key] = b[key];
@@ -109,10 +111,7 @@ function pug_style(val) {
     }
     return out;
   } else {
-    val += '';
-    if (val[val.length - 1] !== ';') 
-      return val + ';';
-    return val;
+    return val + '';
   }
 };
 
diff --git a/packages/pug-runtime/test/index.test.js b/packages/pug-runtime/test/index.test.js
index 6618b63a7..c729b0c82 100644
--- a/packages/pug-runtime/test/index.test.js
+++ b/packages/pug-runtime/test/index.test.js
@@ -132,7 +132,7 @@ addTest('merge', function (merge) {
 addTest('style', function (style) {
   expect(style(null)).toBe('');
   expect(style('')).toBe('');
-  expect(style('foo: bar')).toBe('foo: bar;');
+  expect(style('foo: bar')).toBe('foo: bar');
   expect(style('foo: bar;')).toBe('foo: bar;');
   expect(style({foo: 'bar'})).toBe('foo:bar;');
   expect(style({foo: 'bar', baz: 'bash'})).toBe('foo:bar;baz:bash;');
diff --git a/packages/pug/test/cases-es2015/attr.html b/packages/pug/test/cases-es2015/attr.html
index 5b9fbfbdd..fba8cc120 100644
--- a/packages/pug/test/cases-es2015/attr.html
+++ b/packages/pug/test/cases-es2015/attr.html
@@ -1 +1 @@
-<div class="avatar-div" style="background-image: url(https://www.gravatar.com/avatar/219b77f9d21de75e81851b6b886057c7);"></div>
+<div class="avatar-div" style="background-image: url(https://www.gravatar.com/avatar/219b77f9d21de75e81851b6b886057c7)"></div>
diff --git a/packages/pug/test/cases/styles.html b/packages/pug/test/cases/styles.html
index 394953e32..251556ee4 100644
--- a/packages/pug/test/cases/styles.html
+++ b/packages/pug/test/cases/styles.html
@@ -7,11 +7,11 @@
     </style>
   </head>
   <body>
+    <div style="color:red;background:green"></div>
     <div style="color:red;background:green;"></div>
+    <div style="color:red;background:green"></div>
     <div style="color:red;background:green;"></div>
-    <div style="color:red;background:green;"></div>
-    <div style="color:red;background:green;"></div>
-        <div style="color:red;background:green;"></div>
+        <div style="color:red;background:green"></div>
         <div style="color:red;background:green;"></div>
     <div style="color:red;background:green;"></div>
     <div style="color:red;background:green;"></div>
diff --git a/packages/pug/test/output-es2015/attr.html b/packages/pug/test/output-es2015/attr.html
index 25c479ac8..63a82c0d4 100644
--- a/packages/pug/test/output-es2015/attr.html
+++ b/packages/pug/test/output-es2015/attr.html
@@ -1,2 +1,2 @@
 
-<div class="avatar-div" style="background-image: url(https://www.gravatar.com/avatar/219b77f9d21de75e81851b6b886057c7);"></div>
\ No newline at end of file
+<div class="avatar-div" style="background-image: url(https://www.gravatar.com/avatar/219b77f9d21de75e81851b6b886057c7)"></div>
\ No newline at end of file
diff --git a/packages/pug/test/pug.test.js b/packages/pug/test/pug.test.js
index 4fb073ae3..228dadbd9 100644
--- a/packages/pug/test/pug.test.js
+++ b/packages/pug/test/pug.test.js
@@ -371,8 +371,8 @@ describe('pug', function(){
       assert.equal('<a href="http://google.com" title="Some : weird = title"></a>', pug.render('a(href= "http://google.com", title= "Some : weird = title")'));
       assert.equal('<label for="name"></label>', pug.render('label(for="name")'));
       assert.equal('<meta name="viewport" content="width=device-width"/>', pug.render("meta(name= 'viewport', content='width=device-width')"), 'Test attrs that contain attr separators');
-      assert.equal('<div style="color= white;"></div>', pug.render("div(style='color= white')"));
-      assert.equal('<div style="color: white;"></div>', pug.render("div(style='color: white')"));
+      assert.equal('<div style="color= white"></div>', pug.render("div(style='color= white')"));
+      assert.equal('<div style="color: white"></div>', pug.render("div(style='color: white')"));
       assert.equal('<p class="foo"></p>', pug.render("p('class'='foo')"), 'Test keys with single quotes');
       assert.equal('<p class="foo"></p>', pug.render("p(\"class\"= 'foo')"), 'Test keys with double quotes');
 
@@ -389,10 +389,10 @@ describe('pug', function(){
 
       assert.equal('<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>', pug.render('meta(http-equiv="X-UA-Compatible", content="IE=edge,chrome=1")'));
 
-      assert.equal('<div style="background: url(/images/test.png);">Foo</div>', pug.render("div(style= 'background: url(/images/test.png)') Foo"));
-      assert.equal('<div style="background = url(/images/test.png);">Foo</div>', pug.render("div(style= 'background = url(/images/test.png)') Foo"));
-      assert.equal('<div style="foo;">Foo</div>', pug.render("div(style= ['foo', 'bar'][0]) Foo"));
-      assert.equal('<div style="bar;">Foo</div>', pug.render("div(style= { foo: 'bar', baz: 'raz' }['foo']) Foo"));
+      assert.equal('<div style="background: url(/images/test.png)">Foo</div>', pug.render("div(style= 'background: url(/images/test.png)') Foo"));
+      assert.equal('<div style="background = url(/images/test.png)">Foo</div>', pug.render("div(style= 'background = url(/images/test.png)') Foo"));
+      assert.equal('<div style="foo">Foo</div>', pug.render("div(style= ['foo', 'bar'][0]) Foo"));
+      assert.equal('<div style="bar">Foo</div>', pug.render("div(style= { foo: 'bar', baz: 'raz' }['foo']) Foo"));
       assert.equal('<a href="def">Foo</a>', pug.render("a(href='abcdefg'.substr(3,3)) Foo"));
       assert.equal('<a href="def">Foo</a>', pug.render("a(href={test: 'abcdefg'}.test.substr(3,3)) Foo"));
       assert.equal('<a href="def">Foo</a>', pug.render("a(href={test: 'abcdefg'}.test.substr(3,[0,3][1])) Foo"));

From 76321eb51ba56b1cae7bec96e01cf86cc31aa60b Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 6 Mar 2018 13:11:44 +0000
Subject: [PATCH 42/96] Support yarn workspaces

---
 .yarnrc      |  1 +
 lerna.json   | 13 +++++++------
 package.json |  7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 .yarnrc

diff --git a/.yarnrc b/.yarnrc
new file mode 100644
index 000000000..24efd034b
--- /dev/null
+++ b/.yarnrc
@@ -0,0 +1 @@
+workspaces-experimental true
\ No newline at end of file
diff --git a/lerna.json b/lerna.json
index 34c9af290..7f5b1c80c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,8 @@
 {
-  "lerna": "2.0.0-beta.32",
-  "packages": [
-    "packages/*"
-  ],
-  "version": "independent"
-}
+  "lerna": "2.9.0",
+  "packages": ["packages/*"],
+  "npmClient": "yarn",
+  "useWorkspaces": true,
+  "version": "independent",
+  "registry": "https://registry.npmjs.org/"
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index b6eea874f..f31a0f7b3 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "devDependencies": {
     "coveralls": "^2.11.2",
     "jest": "^18.1.0",
-    "lerna": "2.0.0-beta.32",
+    "lerna": "2.9.0",
     "prettier": "^1.3.1"
   },
   "repository": {
@@ -12,9 +12,9 @@
     "url": "https://github.com/pugjs/pug.git"
   },
   "scripts": {
+    "bootstrap": "lerna bootstrap",
     "clean": "lerna clean",
     "release": "lerna publish",
-    "postinstall": "lerna bootstrap",
     "pretest": "lerna run pretest",
     "test": "jest",
     "coverage": "jest --coverage",
@@ -28,5 +28,6 @@
       "./scripts/prettier-javascript-serializer.js"
     ]
   },
-  "license": "MIT"
+  "license": "MIT",
+  "workspaces": ["packages/*"]
 }

From 540cddd301e374cd9365bc65cac1427edb422ea1 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 6 Mar 2018 13:12:24 +0000
Subject: [PATCH 43/96] Publish

 - pug-attrs@2.0.3
 - pug-code-gen@2.0.1
 - pug-filters@3.0.0
 - pug-lexer@4.0.0
 - pug-linker@3.0.4
 - pug-load@2.0.10
 - pug-parser@4.0.1
 - pug-runtime@2.0.4
 - pug-strip-comments@1.0.3
 - pug-walk@1.1.6
 - pug@2.0.0
---
 packages/pug-attrs/package.json          |  6 +++---
 packages/pug-code-gen/package.json       |  6 +++---
 packages/pug-filters/package.json        | 12 ++++++------
 packages/pug-lexer/package.json          |  2 +-
 packages/pug-linker/package.json         | 10 +++++-----
 packages/pug-load/package.json           |  8 ++++----
 packages/pug-parser/package.json         |  2 +-
 packages/pug-runtime/package.json        |  3 +--
 packages/pug-strip-comments/package.json |  2 +-
 packages/pug-walk/package.json           |  7 +++----
 packages/pug/package.json                | 18 +++++++++---------
 11 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/packages/pug-attrs/package.json b/packages/pug-attrs/package.json
index e88dc6516..1ec46abb3 100644
--- a/packages/pug-attrs/package.json
+++ b/packages/pug-attrs/package.json
@@ -1,14 +1,14 @@
 {
   "name": "pug-attrs",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Generate code for Pug attributes",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "constantinople": "^3.0.1",
-    "pug-runtime": "^2.0.3",
-    "js-stringify": "^1.0.1"
+    "js-stringify": "^1.0.1",
+    "pug-runtime": "^2.0.4"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index 5aefc9621..a1d1644a0 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-code-gen",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Default code-generator for pug.  It generates HTML via a JavaScript template function.",
   "keywords": [
     "pug"
@@ -9,9 +9,9 @@
     "constantinople": "^3.0.1",
     "doctypes": "^1.1.0",
     "js-stringify": "^1.0.1",
-    "pug-attrs": "^2.0.2",
+    "pug-attrs": "^2.0.3",
     "pug-error": "^1.3.2",
-    "pug-runtime": "^2.0.3",
+    "pug-runtime": "^2.0.4",
     "void-elements": "^2.0.1",
     "with": "^5.0.0"
   },
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index f870784f1..3eff05ff0 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "2.1.5",
+  "version": "3.0.0",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
@@ -8,9 +8,9 @@
   "dependencies": {
     "clean-css": "^3.3.0",
     "constantinople": "^3.0.1",
-    "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.5",
     "jstransformer": "1.0.0",
+    "pug-error": "^1.3.2",
+    "pug-walk": "^1.1.6",
     "resolve": "^1.1.6",
     "uglify-js": "^2.6.1"
   },
@@ -22,9 +22,9 @@
     "jstransformer-markdown-it": "^1.0.0",
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
-    "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.9",
-    "pug-parser": "^4.0.0"
+    "pug-lexer": "^4.0.0",
+    "pug-load": "^2.0.10",
+    "pug-parser": "^4.0.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index 063c606ac..86dde2367 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-lexer",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "description": "The pug lexer (takes a string and converts it to an array of tokens)",
   "keywords": [
     "pug"
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index f3f47133d..b78a878c1 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,18 +1,18 @@
 {
   "name": "pug-linker",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.5"
+    "pug-walk": "^1.1.6"
   },
   "devDependencies": {
-    "pug-lexer": "^3.1.0",
-    "pug-load": "^2.0.9",
-    "pug-parser": "^4.0.0"
+    "pug-lexer": "^4.0.0",
+    "pug-load": "^2.0.10",
+    "pug-parser": "^4.0.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index ab74d9220..7663aaa2a 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -1,17 +1,17 @@
 {
   "name": "pug-load",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "The Pug loader is responsible for loading the depenendencies of a given Pug file.",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "object-assign": "^4.1.0",
-    "pug-walk": "^1.1.5"
+    "pug-walk": "^1.1.6"
   },
   "devDependencies": {
-    "pug-lexer": "^3.1.0",
-    "pug-parser": "^4.0.0"
+    "pug-lexer": "^4.0.0",
+    "pug-parser": "^4.0.1"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index e72b0245f..78cf6165d 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-parser",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree)",
   "keywords": [
     "pug"
diff --git a/packages/pug-runtime/package.json b/packages/pug-runtime/package.json
index 52f2c935a..247f0a8ee 100644
--- a/packages/pug-runtime/package.json
+++ b/packages/pug-runtime/package.json
@@ -1,11 +1,10 @@
 {
   "name": "pug-runtime",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "The runtime components for the pug templating language",
   "keywords": [
     "pug"
   ],
-  "dependencies": {},
   "devDependencies": {
     "uglify-js": "^2.6.1"
   },
diff --git a/packages/pug-strip-comments/package.json b/packages/pug-strip-comments/package.json
index 2d2c41a83..17c7afee7 100644
--- a/packages/pug-strip-comments/package.json
+++ b/packages/pug-strip-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-strip-comments",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Strip comments from a Pug token stream (from the lexer)",
   "keywords": [
     "pug"
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index c0fa60070..86e96ca43 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -1,14 +1,13 @@
 {
   "name": "pug-walk",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Walk and transform a pug AST",
   "keywords": [
     "pug"
   ],
-  "dependencies": {},
   "devDependencies": {
-    "pug-lexer": "^3.1.0",
-    "pug-parser": "^4.0.0"
+    "pug-lexer": "^4.0.0",
+    "pug-parser": "^4.0.1"
   },
   "files": [
     "index.js"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 51f5c1f95..e999654f5 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.0-rc.4",
+  "version": "2.0.0",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -20,14 +20,14 @@
   },
   "main": "lib",
   "dependencies": {
-    "pug-code-gen": "^2.0.0",
-    "pug-filters": "^2.1.5",
-    "pug-lexer": "^3.1.0",
-    "pug-linker": "^3.0.3",
-    "pug-load": "^2.0.9",
-    "pug-parser": "^4.0.0",
-    "pug-runtime": "^2.0.3",
-    "pug-strip-comments": "^1.0.2"
+    "pug-code-gen": "^2.0.1",
+    "pug-filters": "^3.0.0",
+    "pug-lexer": "^4.0.0",
+    "pug-linker": "^3.0.4",
+    "pug-load": "^2.0.10",
+    "pug-parser": "^4.0.1",
+    "pug-runtime": "^2.0.4",
+    "pug-strip-comments": "^1.0.3"
   },
   "devDependencies": {
     "jstransformer-cdata": "^1.0.0",

From 3e233dd8080617685992dc6346f739a6f6396aae Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Thu, 8 Mar 2018 16:32:29 +0000
Subject: [PATCH 44/96] Publish

 - pug-filters@3.0.1
 - pug-linker@3.0.5
 - pug-load@2.0.11
 - pug-parser@5.0.0
 - pug-walk@1.1.7
 - pug@2.0.1
---
 packages/pug-filters/package.json |  8 ++++----
 packages/pug-linker/package.json  |  8 ++++----
 packages/pug-load/package.json    |  6 +++---
 packages/pug-parser/package.json  |  2 +-
 packages/pug-walk/package.json    |  4 ++--
 packages/pug/package.json         | 10 +++++-----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 3eff05ff0..2aef72565 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
@@ -10,7 +10,7 @@
     "constantinople": "^3.0.1",
     "jstransformer": "1.0.0",
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.6",
+    "pug-walk": "^1.1.7",
     "resolve": "^1.1.6",
     "uglify-js": "^2.6.1"
   },
@@ -23,8 +23,8 @@
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
     "pug-lexer": "^4.0.0",
-    "pug-load": "^2.0.10",
-    "pug-parser": "^4.0.1"
+    "pug-load": "^2.0.11",
+    "pug-parser": "^5.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index b78a878c1..259825ae4 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,18 +1,18 @@
 {
   "name": "pug-linker",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.6"
+    "pug-walk": "^1.1.7"
   },
   "devDependencies": {
     "pug-lexer": "^4.0.0",
-    "pug-load": "^2.0.10",
-    "pug-parser": "^4.0.1"
+    "pug-load": "^2.0.11",
+    "pug-parser": "^5.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index 7663aaa2a..be30b165b 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -1,17 +1,17 @@
 {
   "name": "pug-load",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "The Pug loader is responsible for loading the depenendencies of a given Pug file.",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "object-assign": "^4.1.0",
-    "pug-walk": "^1.1.6"
+    "pug-walk": "^1.1.7"
   },
   "devDependencies": {
     "pug-lexer": "^4.0.0",
-    "pug-parser": "^4.0.1"
+    "pug-parser": "^5.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index 78cf6165d..9a4a7a9bb 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-parser",
-  "version": "4.0.1",
+  "version": "5.0.0",
   "description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree)",
   "keywords": [
     "pug"
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index 86e96ca43..e20552fb1 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -1,13 +1,13 @@
 {
   "name": "pug-walk",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Walk and transform a pug AST",
   "keywords": [
     "pug"
   ],
   "devDependencies": {
     "pug-lexer": "^4.0.0",
-    "pug-parser": "^4.0.1"
+    "pug-parser": "^5.0.0"
   },
   "files": [
     "index.js"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index e999654f5..9ef83b1a1 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -21,11 +21,11 @@
   "main": "lib",
   "dependencies": {
     "pug-code-gen": "^2.0.1",
-    "pug-filters": "^3.0.0",
+    "pug-filters": "^3.0.1",
     "pug-lexer": "^4.0.0",
-    "pug-linker": "^3.0.4",
-    "pug-load": "^2.0.10",
-    "pug-parser": "^4.0.1",
+    "pug-linker": "^3.0.5",
+    "pug-load": "^2.0.11",
+    "pug-parser": "^5.0.0",
     "pug-runtime": "^2.0.4",
     "pug-strip-comments": "^1.0.3"
   },

From 7ff1ccea6135bd1225e84772dba27b01c3ad8872 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 20 Mar 2018 12:16:45 +0000
Subject: [PATCH 45/96] Handle boolean sorthand for filters (#2977)

* Handle boolean sorthand for filters

[closes #2966]

* Commit the yarn lock
---
 .gitignore                                 |    1 -
 .travis.yml                                |    2 +-
 packages/pug-filters/lib/handle-filters.js |    2 +-
 yarn.lock                                  | 3915 ++++++++++++++++++++
 4 files changed, 3917 insertions(+), 3 deletions(-)
 create mode 100644 yarn.lock

diff --git a/.gitignore b/.gitignore
index 09cffd2c0..e09104305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@ npm-debug.log
 .release.json
 lerna-debug.log
 package-lock.json
-yarn.lock
diff --git a/.travis.yml b/.travis.yml
index 63814d8db..c6ddd8e14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ node_js:
 # Use faster Docker architecture on Travis.
 sudo: false
 
-script:        npm test
+script: yarn test
 # TODO: coverage
 # after_success: npm run coveralls
 
diff --git a/packages/pug-filters/lib/handle-filters.js b/packages/pug-filters/lib/handle-filters.js
index fc00fb0b4..91cac9539 100644
--- a/packages/pug-filters/lib/handle-filters.js
+++ b/packages/pug-filters/lib/handle-filters.js
@@ -94,7 +94,7 @@ function getAttributes(node, options) {
   var attrs = {};
   node.attrs.forEach(function (attr) {
     try {
-      attrs[attr.name] = constantinople.toConstant(attr.val);
+      attrs[attr.name] = attr.val === true ? true : constantinople.toConstant(attr.val);
     } catch (ex) {
       if (/not constant/.test(ex.message)) {
         throw error('FILTER_OPTION_NOT_CONSTANT', ex.message + ' All filters are rendered compile-time so filter options must be constants.', node);
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..3f257afd8
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,3915 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/babel-types@*", "@types/babel-types@^7.0.0":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.1.tgz#1405e5396968c4302994b0161ce405b72b874257"
+
+"@types/babylon@^6.16.2":
+  version "6.16.2"
+  resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
+  dependencies:
+    "@types/babel-types" "*"
+
+JSONStream@^1.0.4:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
+abab@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+
+acorn-globals@^3.0.0, acorn-globals@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  dependencies:
+    acorn "^4.0.4"
+
+acorn@^3.0.4, acorn@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^4.0.4, acorn@~4.0.2:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+
+add-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
+
+ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+ajv@^5.1.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-escapes@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-escapes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
+ansicolors@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  dependencies:
+    default-require-extensions "^1.0.0"
+
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-ify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+async@^1.4.0, async@^1.5.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+async@^2.1.4:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+  dependencies:
+    lodash "^4.14.0"
+
+async@~0.2.6:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.2.1, aws4@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.0.0, babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-jest@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-18.0.0.tgz#17ebba8cb3285c906d859e8707e4e79795fb65e3"
+  dependencies:
+    babel-core "^6.0.0"
+    babel-plugin-istanbul "^3.0.0"
+    babel-preset-jest "^18.0.0"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-istanbul@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-3.1.2.tgz#11d5abde18425ec24b5d648c7e0b5d25cd354a22"
+  dependencies:
+    find-up "^1.1.2"
+    istanbul-lib-instrument "^1.4.2"
+    object-assign "^4.1.0"
+    test-exclude "^3.3.0"
+
+babel-plugin-jest-hoist@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-18.0.0.tgz#4150e70ecab560e6e7344adc849498072d34e12a"
+
+babel-preset-jest@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-18.0.0.tgz#84faf8ca3ec65aba7d5e3f59bbaed935ab24049e"
+  dependencies:
+    babel-plugin-jest-hoist "^18.0.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.18.0, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.18.0, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+barrage@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/barrage/-/barrage-1.1.0.tgz#6f5384765c463f7718012f160dccf033fc6fc394"
+  dependencies:
+    promise "^6.0.0"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+browser-resolve@^1.11.2:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  dependencies:
+    resolve "1.1.7"
+
+bser@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
+  dependencies:
+    node-int64 "^0.4.0"
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+byline@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase-keys@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  dependencies:
+    camelcase "^4.1.0"
+    map-obj "^2.0.0"
+    quick-lru "^1.0.0"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+
+capture-stack-trace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+
+cardinal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
+  dependencies:
+    ansicolors "~0.2.1"
+    redeyed "~1.0.0"
+
+caseless@~0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.1.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+character-parser@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  dependencies:
+    is-regex "^1.0.3"
+
+chardet@^0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+
+ci-info@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
+
+clean-css@^3.3.0:
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  dependencies:
+    commander "2.8.x"
+    source-map "0.4.x"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-table@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+  dependencies:
+    colors "1.0.3"
+
+cli-usage@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/cli-usage/-/cli-usage-0.1.7.tgz#eaf1c9d5b91e22482333072a12127f05cd99a3ba"
+  dependencies:
+    marked "^0.3.12"
+    marked-terminal "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+clone@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+
+clone@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
+
+cmd-shim@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
+  dependencies:
+    graceful-fs "^4.1.2"
+    mkdirp "~0.5.0"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+coffee-script@~1.12.7:
+  version "1.12.7"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+
+color-convert@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+
+columnify@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  dependencies:
+    strip-ansi "^3.0.0"
+    wcwidth "^1.0.0"
+
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+command-join@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
+
+commander@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@^2.9.0:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+
+compare-func@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  dependencies:
+    array-ify "^1.0.0"
+    dot-prop "^3.0.0"
+
+compare-versions@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@^1.4.10, concat-stream@^1.4.6, concat-stream@^1.4.7:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+constantinople@^3.0.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
+  dependencies:
+    "@types/babel-types" "^7.0.0"
+    "@types/babylon" "^6.16.2"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+
+content-type-parser@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
+
+conventional-changelog-angular@^1.6.6:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-atom@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz#4917759947f4db86073f9d3838a2d54302d5843d"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-cli@^1.3.13:
+  version "1.3.16"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.16.tgz#69acdcc4b68b4d123c5945868dffe394960cea9d"
+  dependencies:
+    add-stream "^1.0.0"
+    conventional-changelog "^1.1.18"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    tempfile "^1.1.1"
+
+conventional-changelog-codemirror@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz#debc43991d487d7964e65087fbbe034044bd51fb"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-core@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz#45b6347c4c6512e1f163f7ff55c9f5bcb88fd990"
+  dependencies:
+    conventional-changelog-writer "^3.0.4"
+    conventional-commits-parser "^2.1.5"
+    dateformat "^3.0.0"
+    get-pkg-repo "^1.0.0"
+    git-raw-commits "^1.3.4"
+    git-remote-origin-url "^2.0.0"
+    git-semver-tags "^1.3.4"
+    lodash "^4.2.1"
+    normalize-package-data "^2.3.5"
+    q "^1.5.1"
+    read-pkg "^1.1.0"
+    read-pkg-up "^1.0.1"
+    through2 "^2.0.0"
+
+conventional-changelog-ember@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz#f3825d7434168f3d9211b5532dc1d5769532b668"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-eslint@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz#8bae05ebbf574e6506caf7b37dc51ca21b74d220"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-express@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz#812a9cf778677e12f978ac9c40d85297c0bfcca9"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-jquery@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-jscs@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-jshint@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz#b2de33cd0870d9af804ac6a4fded0ee25b69c9bb"
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-preset-loader@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz#b29af6332f9313857be36427623c9016bfeeaf33"
+
+conventional-changelog-writer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz#705b46a8b8277bd7fd79cad8032095b5d803864c"
+  dependencies:
+    compare-func "^1.3.1"
+    conventional-commits-filter "^1.1.5"
+    dateformat "^3.0.0"
+    handlebars "^4.0.2"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    semver "^5.5.0"
+    split "^1.0.0"
+    through2 "^2.0.0"
+
+conventional-changelog@^1.1.18:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.18.tgz#ffe28798e4ddef5f6e2f74398e8248bcb233360b"
+  dependencies:
+    conventional-changelog-angular "^1.6.6"
+    conventional-changelog-atom "^0.2.4"
+    conventional-changelog-codemirror "^0.3.4"
+    conventional-changelog-core "^2.0.5"
+    conventional-changelog-ember "^0.3.6"
+    conventional-changelog-eslint "^1.0.5"
+    conventional-changelog-express "^0.3.4"
+    conventional-changelog-jquery "^0.1.0"
+    conventional-changelog-jscs "^0.1.0"
+    conventional-changelog-jshint "^0.3.4"
+    conventional-changelog-preset-loader "^1.1.6"
+
+conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz#77aac065e3de9c1a74b801e8e25c9affb3184f65"
+  dependencies:
+    is-subset "^0.1.1"
+    modify-values "^1.0.0"
+
+conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz#9ac3a4ab221c0c3c9e9dd2c09ae01e6d1e1dabe0"
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+    trim-off-newlines "^1.0.0"
+
+conventional-recommended-bump@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz#1b7137efb5091f99fe009e2fe9ddb7cc490e9375"
+  dependencies:
+    concat-stream "^1.4.10"
+    conventional-commits-filter "^1.1.1"
+    conventional-commits-parser "^2.1.1"
+    git-raw-commits "^1.3.0"
+    git-semver-tags "^1.3.0"
+    meow "^3.3.0"
+    object-assign "^4.0.1"
+
+convert-source-map@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
+core-js@^2.4.0, core-js@^2.5.0:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+coveralls@^2.11.2:
+  version "2.13.3"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.3.tgz#9ad7c2ae527417f361e8b626483f48ee92dd2bc7"
+  dependencies:
+    js-yaml "3.6.1"
+    lcov-parse "0.0.10"
+    log-driver "1.2.5"
+    minimist "1.2.0"
+    request "2.79.0"
+
+create-error-class@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.37 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  dependencies:
+    cssom "0.3.x"
+
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  dependencies:
+    array-find-index "^1.0.1"
+
+dargs@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+dateformat@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+
+debug@*, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.6.8:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+decamelize-keys@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+
+deep-extend@~0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  dependencies:
+    strip-bom "^2.0.0"
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  dependencies:
+    clone "^1.0.2"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  dependencies:
+    repeating "^2.0.0"
+
+detect-indent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+
+diff@^3.0.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
+doctypes@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+
+dot-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  dependencies:
+    is-obj "^1.0.0"
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+errno@^0.1.1, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.2.0, error-ex@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+esprima@^2.6.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+esprima@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
+
+estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+exec-sh@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+  dependencies:
+    merge "^1.1.3"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+extend@~3.0.0, extend@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
+external-editor@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  dependencies:
+    chardet "^0.4.0"
+    iconv-lite "^0.4.17"
+    tmp "^0.0.33"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fb-watchman@^1.8.0, fb-watchman@^1.9.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383"
+  dependencies:
+    bser "1.0.2"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+
+fileset@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+find-up@^1.0.0, find-up@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  dependencies:
+    locate-path "^2.0.0"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+form-data@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
+fs-extra@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+function-bind@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+get-pkg-repo@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    meow "^3.3.0"
+    normalize-package-data "^2.3.0"
+    parse-github-repo-url "^1.3.0"
+    through2 "^2.0.0"
+
+get-port@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
+
+get-repo@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-repo/-/get-repo-1.0.0.tgz#b14624bba917b677397d00feed98dd316a21b140"
+  dependencies:
+    barrage "^1.1.0"
+    concat-stream "^1.4.7"
+    http-basic "^1.1.0"
+    promise "^6.0.1"
+    tar "^1.0.3"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+git-raw-commits@^1.3.0, git-raw-commits@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.4.tgz#442c3df5985b4f5689e9e43597f5194736aac001"
+  dependencies:
+    dargs "^4.0.1"
+    lodash.template "^4.0.2"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+
+git-remote-origin-url@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  dependencies:
+    gitconfiglocal "^1.0.0"
+    pify "^2.3.0"
+
+git-semver-tags@^1.3.0, git-semver-tags@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.4.tgz#2ceb2a355c6d7514c123c35e297067d08caf3a92"
+  dependencies:
+    meow "^4.0.0"
+    semver "^5.5.0"
+
+gitconfiglocal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  dependencies:
+    ini "^1.3.2"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+got@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  dependencies:
+    create-error-class "^3.0.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    unzip-response "^2.0.1"
+    url-parse-lax "^1.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+
+growly@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+
+handlebars@^4.0.2, handlebars@^4.0.3:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+  dependencies:
+    async "^1.4.0"
+    optimist "^0.6.1"
+    source-map "^0.4.4"
+  optionalDependencies:
+    uglify-js "^2.6"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  dependencies:
+    chalk "^1.1.1"
+    commander "^2.9.0"
+    is-my-json-valid "^2.12.4"
+    pinkie-promise "^2.0.0"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+hoek@4.x.x:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+
+html-encoding-sniffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+http-basic@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-basic/-/http-basic-1.1.1.tgz#caf71e9f7d54eebee550eec9b6351d0c68a9b886"
+  dependencies:
+    concat-stream "^1.4.6"
+    http-response-object "^1.0.0"
+
+http-response-object@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-1.1.0.tgz#a7c4e75aae82f3bb4904e4f43f615673b4d518c3"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+iconv-lite@0.4.19, iconv-lite@^0.4.17:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+ini@^1.3.2, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+
+inquirer@^3.2.2:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.0.4"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rx-lite "^4.0.8"
+    rx-lite-aggregates "^4.0.8"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-ci@^1.0.10, is-ci@^1.0.9:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  dependencies:
+    ci-info "^1.0.0"
+
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-expression@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  dependencies:
+    acorn "~4.0.2"
+    object-assign "^4.0.1"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-extglob@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+
+is-my-json-valid@^2.12.4:
+  version "2.17.2"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
+is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-promise@^2.0.0, is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+
+is-regex@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-retry-allowed@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+
+is-stream@^1.0.0, is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-subset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+
+is-text-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  dependencies:
+    text-extensions "^1.0.0"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+isarray@1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+istanbul-api@^1.1.0-alpha.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
+  dependencies:
+    async "^2.1.4"
+    compare-versions "^3.1.0"
+    fileset "^2.0.2"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-hook "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-report "^1.1.4"
+    istanbul-lib-source-maps "^1.2.4"
+    istanbul-reports "^1.3.0"
+    js-yaml "^3.7.0"
+    mkdirp "^0.5.1"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
+
+istanbul-lib-hook@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.4.2:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.0"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+  dependencies:
+    istanbul-lib-coverage "^1.2.0"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.2.0"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
+  dependencies:
+    handlebars "^4.0.3"
+
+jest-changed-files@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-17.0.2.tgz#f5657758736996f590a51b87e5c9369d904ba7b7"
+
+jest-cli@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-18.1.0.tgz#5ead36ecad420817c2c9baa2aa7574f63257b3d6"
+  dependencies:
+    ansi-escapes "^1.4.0"
+    callsites "^2.0.0"
+    chalk "^1.1.1"
+    graceful-fs "^4.1.6"
+    is-ci "^1.0.9"
+    istanbul-api "^1.1.0-alpha.1"
+    istanbul-lib-coverage "^1.0.0"
+    istanbul-lib-instrument "^1.1.1"
+    jest-changed-files "^17.0.2"
+    jest-config "^18.1.0"
+    jest-environment-jsdom "^18.1.0"
+    jest-file-exists "^17.0.0"
+    jest-haste-map "^18.1.0"
+    jest-jasmine2 "^18.1.0"
+    jest-mock "^18.0.0"
+    jest-resolve "^18.1.0"
+    jest-resolve-dependencies "^18.1.0"
+    jest-runtime "^18.1.0"
+    jest-snapshot "^18.1.0"
+    jest-util "^18.1.0"
+    json-stable-stringify "^1.0.0"
+    node-notifier "^4.6.1"
+    sane "~1.4.1"
+    strip-ansi "^3.0.1"
+    throat "^3.0.0"
+    which "^1.1.1"
+    worker-farm "^1.3.1"
+    yargs "^6.3.0"
+
+jest-config@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-18.1.0.tgz#6111740a6d48aab86ff5a9e6ab0b98bd993b6ff4"
+  dependencies:
+    chalk "^1.1.1"
+    jest-environment-jsdom "^18.1.0"
+    jest-environment-node "^18.1.0"
+    jest-jasmine2 "^18.1.0"
+    jest-mock "^18.0.0"
+    jest-resolve "^18.1.0"
+    jest-util "^18.1.0"
+    json-stable-stringify "^1.0.0"
+
+jest-diff@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-18.1.0.tgz#4ff79e74dd988c139195b365dc65d87f606f4803"
+  dependencies:
+    chalk "^1.1.3"
+    diff "^3.0.0"
+    jest-matcher-utils "^18.1.0"
+    pretty-format "^18.1.0"
+
+jest-environment-jsdom@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-18.1.0.tgz#18b42f0c4ea2bae9f36cab3639b1e8f8c384e24e"
+  dependencies:
+    jest-mock "^18.0.0"
+    jest-util "^18.1.0"
+    jsdom "^9.9.1"
+
+jest-environment-node@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-18.1.0.tgz#4d6797572c8dda99acf5fae696eb62945547c779"
+  dependencies:
+    jest-mock "^18.0.0"
+    jest-util "^18.1.0"
+
+jest-file-exists@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-17.0.0.tgz#7f63eb73a1c43a13f461be261768b45af2cdd169"
+
+jest-haste-map@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-18.1.0.tgz#06839c74b770a40c1a106968851df8d281c08375"
+  dependencies:
+    fb-watchman "^1.9.0"
+    graceful-fs "^4.1.6"
+    micromatch "^2.3.11"
+    sane "~1.4.1"
+    worker-farm "^1.3.1"
+
+jest-jasmine2@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-18.1.0.tgz#094e104c2c189708766c77263bb2aecb5860a80b"
+  dependencies:
+    graceful-fs "^4.1.6"
+    jest-matcher-utils "^18.1.0"
+    jest-matchers "^18.1.0"
+    jest-snapshot "^18.1.0"
+    jest-util "^18.1.0"
+
+jest-matcher-utils@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-18.1.0.tgz#1ac4651955ee2a60cef1e7fcc98cdfd773c0f932"
+  dependencies:
+    chalk "^1.1.3"
+    pretty-format "^18.1.0"
+
+jest-matchers@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-18.1.0.tgz#0341484bf87a1fd0bac0a4d2c899e2b77a3f1ead"
+  dependencies:
+    jest-diff "^18.1.0"
+    jest-matcher-utils "^18.1.0"
+    jest-util "^18.1.0"
+    pretty-format "^18.1.0"
+
+jest-mock@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-18.0.0.tgz#5c248846ea33fa558b526f5312ab4a6765e489b3"
+
+jest-resolve-dependencies@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-18.1.0.tgz#8134fb5caf59c9ed842fe0152ab01c52711f1bbb"
+  dependencies:
+    jest-file-exists "^17.0.0"
+    jest-resolve "^18.1.0"
+
+jest-resolve@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-18.1.0.tgz#6800accb536658c906cd5e29de412b1ab9ac249b"
+  dependencies:
+    browser-resolve "^1.11.2"
+    jest-file-exists "^17.0.0"
+    jest-haste-map "^18.1.0"
+    resolve "^1.2.0"
+
+jest-runtime@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-18.1.0.tgz#3abfd687175b21fc3b85a2b8064399e997859922"
+  dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^18.0.0"
+    babel-plugin-istanbul "^3.0.0"
+    chalk "^1.1.3"
+    graceful-fs "^4.1.6"
+    jest-config "^18.1.0"
+    jest-file-exists "^17.0.0"
+    jest-haste-map "^18.1.0"
+    jest-mock "^18.0.0"
+    jest-resolve "^18.1.0"
+    jest-snapshot "^18.1.0"
+    jest-util "^18.1.0"
+    json-stable-stringify "^1.0.0"
+    micromatch "^2.3.11"
+    yargs "^6.3.0"
+
+jest-snapshot@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-18.1.0.tgz#55b96d2ee639c9bce76f87f2a3fd40b71c7a5916"
+  dependencies:
+    jest-diff "^18.1.0"
+    jest-file-exists "^17.0.0"
+    jest-matcher-utils "^18.1.0"
+    jest-util "^18.1.0"
+    natural-compare "^1.4.0"
+    pretty-format "^18.1.0"
+
+jest-util@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-18.1.0.tgz#3a99c32114ab17f84be094382527006e6d4bfc6a"
+  dependencies:
+    chalk "^1.1.1"
+    diff "^3.0.0"
+    graceful-fs "^4.1.6"
+    jest-file-exists "^17.0.0"
+    jest-mock "^18.0.0"
+    mkdirp "^0.5.1"
+
+jest@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-18.1.0.tgz#bcebf1e203dee5c2ad2091c805300a343d9e6c7d"
+  dependencies:
+    jest-cli "^18.1.0"
+
+js-stringify@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+
+js-tokens@^3.0.0, js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+js-yaml@^3.7.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@^9.9.1:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+  dependencies:
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
+    whatwg-encoding "^1.0.1"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+json-parse-better-errors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jstransformer-cdata@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer-cdata/-/jstransformer-cdata-1.0.0.tgz#3c15f0696478d39a4564a33010094b90b7ee9fb6"
+
+jstransformer-coffee-script@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/jstransformer-coffee-script/-/jstransformer-coffee-script-1.1.1.tgz#6455eb2f8b26fdff2abeb1b3c9875e6b1f4f8fa6"
+  dependencies:
+    coffee-script "~1.12.7"
+    merge "^1.2.0"
+
+jstransformer-less@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jstransformer-less/-/jstransformer-less-2.3.0.tgz#ac3a2f8ad688d73179495bbab85c7216ad5608eb"
+  dependencies:
+    less "^2.3.1"
+    less-plugin-inline-urls "^1.1.0"
+    less-plugin-npm-import "^2.0.0"
+
+jstransformer-markdown-it@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer-markdown-it/-/jstransformer-markdown-it-1.0.0.tgz#4138c5fd04149e10e529408d35526b3a6f7724ef"
+  dependencies:
+    markdown-it "^7.0.0"
+
+jstransformer-stylus@^1.0.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/jstransformer-stylus/-/jstransformer-stylus-1.5.0.tgz#9e65a9225eda4bd586c5da69d3d3d8661018ebf7"
+  dependencies:
+    clone "^2.0.0"
+    stylus "~0.54.5"
+
+jstransformer-uglify-js@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/jstransformer-uglify-js/-/jstransformer-uglify-js-1.2.0.tgz#f26b5fb2a99bb0f5354f884cb50b5914bc5224a8"
+  dependencies:
+    uglify-js "^2.8.10"
+
+jstransformer-verbatim@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/jstransformer-verbatim/-/jstransformer-verbatim-1.1.1.tgz#8cda3f804146ac5f0f70bcc5b60a0cc79f8c4d94"
+
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
+kind-of@^3.0.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+lcov-parse@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
+
+lerna@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.9.0.tgz#303f70bc50b1c4541bdcf54eda13c36fe54401f3"
+  dependencies:
+    async "^1.5.0"
+    chalk "^2.1.0"
+    cmd-shim "^2.0.2"
+    columnify "^1.5.4"
+    command-join "^2.0.0"
+    conventional-changelog-cli "^1.3.13"
+    conventional-recommended-bump "^1.2.1"
+    dedent "^0.7.0"
+    execa "^0.8.0"
+    find-up "^2.1.0"
+    fs-extra "^4.0.1"
+    get-port "^3.2.0"
+    glob "^7.1.2"
+    glob-parent "^3.1.0"
+    globby "^6.1.0"
+    graceful-fs "^4.1.11"
+    hosted-git-info "^2.5.0"
+    inquirer "^3.2.2"
+    is-ci "^1.0.10"
+    load-json-file "^4.0.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    package-json "^4.0.1"
+    path-exists "^3.0.0"
+    read-cmd-shim "^1.0.1"
+    read-pkg "^3.0.0"
+    rimraf "^2.6.1"
+    safe-buffer "^5.1.1"
+    semver "^5.4.1"
+    signal-exit "^3.0.2"
+    slash "^1.0.0"
+    strong-log-transformer "^1.0.6"
+    temp-write "^3.3.0"
+    write-file-atomic "^2.3.0"
+    write-json-file "^2.2.0"
+    write-pkg "^3.1.0"
+    yargs "^8.0.2"
+
+less-plugin-inline-urls@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/less-plugin-inline-urls/-/less-plugin-inline-urls-1.2.0.tgz#5ddab07a0c2571f1a2855cf929ddc9efc1e38acc"
+
+less-plugin-npm-import@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  dependencies:
+    promise "~7.0.1"
+    resolve "~1.1.6"
+
+less@^2.3.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.2.11"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "2.81.0"
+    source-map "^0.5.3"
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+line-json@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/line-json/-/line-json-1.0.0.tgz#6b40439bc8f41f666076daedeced1b1c68347669"
+
+linkify-it@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
+  dependencies:
+    uc.micro "^1.0.1"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash._arraycopy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
+
+lodash._arrayeach@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._baseclone@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz#303519bf6393fe7e42f34d8b630ef7794e3542b7"
+  dependencies:
+    lodash._arraycopy "^3.0.0"
+    lodash._arrayeach "^3.0.0"
+    lodash._baseassign "^3.0.0"
+    lodash._basefor "^3.0.0"
+    lodash.isarray "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+
+lodash._basefor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
+
+lodash._bindcallback@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+
+lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+
+lodash.clonedeep@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz#a0a1e40d82a5ea89ff5b147b8444ed63d92827db"
+  dependencies:
+    lodash._baseclone "^3.0.0"
+    lodash._bindcallback "^3.0.0"
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.template@^4.0.2:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
+lodash.toarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
+
+lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
+log-driver@1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+loose-envify@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
+lowercase-keys@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+
+lru-cache@^4.0.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+make-dir@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
+  dependencies:
+    pify "^3.0.0"
+
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  dependencies:
+    tmpl "1.0.x"
+
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
+map-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+
+markdown-it@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-7.0.1.tgz#f12d8b88a93e64254348dfd183bd70bf60567a42"
+  dependencies:
+    argparse "^1.0.7"
+    entities "~1.1.1"
+    linkify-it "^2.0.0"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.1"
+
+marked-terminal@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-2.0.0.tgz#5eaf568be66f686541afa52a558280310a31de2d"
+  dependencies:
+    cardinal "^1.0.0"
+    chalk "^1.1.3"
+    cli-table "^0.3.1"
+    lodash.assign "^4.2.0"
+    node-emoji "^1.4.1"
+
+marked@^0.3.12:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.17.tgz#607f06668b3c6b1246b28f13da76116ac1aa2d2b"
+
+mdurl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+meow@^3.3.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+meow@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.0.tgz#fd5855dd008db5b92c552082db1c307cba20b29d"
+  dependencies:
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist "^1.1.3"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+
+merge@^1.1.3, merge@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+
+micromatch@^2.3.11:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
+mime@^1.2.11:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
+mimic-fn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+
+minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist-options@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+minimist@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+modify-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
+
+moment@^2.6.0:
+  version "2.21.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+node-emoji@^1.4.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.8.1.tgz#6eec6bfb07421e2148c75c6bba72421f8530a826"
+  dependencies:
+    lodash.toarray "^4.4.0"
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+
+node-notifier@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-4.6.1.tgz#056d14244f3dcc1ceadfe68af9cff0c5473a33f3"
+  dependencies:
+    cli-usage "^0.1.1"
+    growly "^1.2.0"
+    lodash.clonedeep "^3.0.0"
+    minimist "^1.1.1"
+    semver "^5.1.0"
+    shellwords "^0.1.0"
+    which "^1.0.5"
+
+normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+once@^1.3.0, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
+p-limit@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  dependencies:
+    p-limit "^1.1.0"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+package-json@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  dependencies:
+    got "^6.7.1"
+    registry-auth-token "^3.0.1"
+    registry-url "^3.0.3"
+    semver "^5.1.0"
+
+parse-github-repo-url@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  dependencies:
+    error-ex "^1.2.0"
+
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  dependencies:
+    pify "^2.0.0"
+
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+prettier@^1.3.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
+
+pretty-format@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-18.1.0.tgz#fb65a86f7a7f9194963eee91865c1bcf1039e284"
+  dependencies:
+    ansi-styles "^2.2.1"
+
+private@^0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
+promise@^6.0.0, promise@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
+  dependencies:
+    asap "~1.0.0"
+
+promise@^7.0.1, promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  dependencies:
+    asap "~2.0.3"
+
+promise@~7.0.1:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  dependencies:
+    asap "~2.0.3"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+q@^1.4.1, q@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+
+qs@~6.3.0:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
+quick-lru@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+
+randomatic@^1.1.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+rc@^1.0.1, rc@^1.1.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+read-cmd-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
+  dependencies:
+    graceful-fs "^4.1.2"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.0.0"
+
+read-pkg@^1.0.0, read-pkg@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
+readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
+redent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  dependencies:
+    indent-string "^3.0.0"
+    strip-indent "^2.0.0"
+
+redeyed@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
+  dependencies:
+    esprima "~3.0.0"
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
+registry-auth-token@^3.0.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
+registry-url@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  dependencies:
+    rc "^1.0.1"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+request@2.79.0:
+  version "2.79.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    qs "~6.3.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+    uuid "^3.0.0"
+
+request@2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+request@^2.79.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+resolve@1.1.7, resolve@~1.1.6:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
+resolve@^1.1.6, resolve@^1.2.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
+rx-lite-aggregates@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+  dependencies:
+    rx-lite "*"
+
+rx-lite@*, rx-lite@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+sane@~1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-1.4.1.tgz#88f763d74040f5f0c256b6163db399bf110ac715"
+  dependencies:
+    exec-sh "^0.2.0"
+    fb-watchman "^1.8.0"
+    minimatch "^3.0.2"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+    watch "~0.10.0"
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+
+sax@^1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
+shellwords@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.4.x, source-map@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+spdx-correct@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+
+split2@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  dependencies:
+    through2 "^2.0.2"
+
+split@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  dependencies:
+    through "2"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0, string-width@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringstream@~0.0.4, stringstream@~0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  dependencies:
+    get-stdin "^4.0.1"
+
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+strong-log-transformer@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
+  dependencies:
+    byline "^5.0.0"
+    duplexer "^0.1.1"
+    minimist "^0.1.0"
+    moment "^2.6.0"
+    through "^2.3.4"
+
+stylus@~0.54.5:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.1.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  dependencies:
+    has-flag "^3.0.0"
+
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+tar@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-1.0.3.tgz#15bcdab244fa4add44e4244a0176edb8aa9a2b44"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+temp-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+
+temp-write@^3.3.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
+  dependencies:
+    graceful-fs "^4.1.2"
+    is-stream "^1.1.0"
+    make-dir "^1.0.0"
+    pify "^3.0.0"
+    temp-dir "^1.0.0"
+    uuid "^3.0.1"
+
+tempfile@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
+  dependencies:
+    os-tmpdir "^1.0.0"
+    uuid "^2.0.1"
+
+test-exclude@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-3.3.0.tgz#7a17ca1239988c98367b0621456dbb7d4bc38977"
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^2.3.11"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
+text-extensions@^1.0.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
+
+throat@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"
+
+through2@^2.0.0, through2@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+timed-out@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+
+token-stream@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
+
+tough-cookie@^2.3.2, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
+trim-newlines@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+
+trim-off-newlines@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tunnel-agent@~0.4.1:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+uc.micro@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
+
+uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.10:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+"uglify-js@github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7":
+  version "2.7.3"
+  resolved "https://codeload.github.com/mishoo/UglifyJS2/tar.gz/1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
+  dependencies:
+    async "~0.2.6"
+    source-map "~0.5.1"
+    uglify-to-browserify "~1.0.0"
+    yargs "~3.10.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+universalify@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+
+unzip-response@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  dependencies:
+    prepend-http "^1.0.1"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+uuid@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+void-elements@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+
+walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  dependencies:
+    makeerror "1.0.x"
+
+watch@~0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
+
+wcwidth@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  dependencies:
+    defaults "^1.0.3"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+
+webidl-conversions@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+
+whatwg-encoding@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
+  dependencies:
+    iconv-lite "0.4.19"
+
+whatwg-url@^4.3.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+
+which@^1.0.5, which@^1.1.1, which@^1.2.9:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  dependencies:
+    string-width "^1.0.2"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+with@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+  dependencies:
+    acorn "^3.1.0"
+    acorn-globals "^3.0.0"
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+worker-farm@^1.3.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  dependencies:
+    errno "~0.1.7"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+write-json-file@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
+  dependencies:
+    detect-indent "^5.0.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    pify "^3.0.0"
+    sort-keys "^2.0.0"
+    write-file-atomic "^2.0.0"
+
+write-pkg@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9"
+  dependencies:
+    sort-keys "^2.0.0"
+    write-json-file "^2.2.0"
+
+xml-name-validator@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yargs-parser@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^6.3.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"

From 09173980152a7ed63d455829553448ece76c6fdc Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 20 Mar 2018 12:28:41 +0000
Subject: [PATCH 46/96] Publish

 - pug-filters@3.0.2
 - pug@2.0.2
---
 packages/pug-filters/package.json | 2 +-
 packages/pug/package.json         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 2aef72565..3a63a3e61 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 9ef83b1a1..01a7d355d 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -21,7 +21,7 @@
   "main": "lib",
   "dependencies": {
     "pug-code-gen": "^2.0.1",
-    "pug-filters": "^3.0.1",
+    "pug-filters": "^3.0.2",
     "pug-lexer": "^4.0.0",
     "pug-linker": "^3.0.5",
     "pug-load": "^2.0.11",

From 81df277ea92aa06b6a16488f942bb3526a480e2f Mon Sep 17 00:00:00 2001
From: Andrew Aponte <webdev87@gmail.com>
Date: Wed, 21 Mar 2018 07:43:53 -0400
Subject: [PATCH 47/96] fixes #2988 "Update clean-css dependency in
 pug-filters" (#2989)

---
 packages/pug-filters/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 3a63a3e61..15ecb05e1 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -6,7 +6,7 @@
     "pug"
   ],
   "dependencies": {
-    "clean-css": "^3.3.0",
+    "clean-css": "^4.1.11",
     "constantinople": "^3.0.1",
     "jstransformer": "1.0.0",
     "pug-error": "^1.3.2",

From 56d803caaa8a93a040b7be0b8a36abdc4ce8c509 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 21 Mar 2018 11:45:00 +0000
Subject: [PATCH 48/96] Publish

 - pug-filters@3.1.0
 - pug@2.0.3
---
 packages/pug-filters/package.json | 2 +-
 packages/pug/package.json         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 15ecb05e1..f4a835966 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 01a7d355d..ea0aa4331 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -21,7 +21,7 @@
   "main": "lib",
   "dependencies": {
     "pug-code-gen": "^2.0.1",
-    "pug-filters": "^3.0.2",
+    "pug-filters": "^3.1.0",
     "pug-lexer": "^4.0.0",
     "pug-linker": "^3.0.5",
     "pug-load": "^2.0.11",

From 23897f32731ffebae2a7646ed8b50e39020da453 Mon Sep 17 00:00:00 2001
From: Yakima Teng <cleveryun@163.com>
Date: Sun, 15 Apr 2018 14:20:36 +0800
Subject: [PATCH 49/96] fix typo (#2999)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2e857c614..404a53a1d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 
 ## Rename from "Jade"
 
-This project was formerly known as "Jade." However, it has been revealed to us that "Jade" is a registered trademark, and as a result, a rename is needed. After some discussion among the maintainers, **"Pug"** has been chosen as the new name for this project. The next major version will carry "pug" as the package name.
+This project was formerly known as "Jade". However, it has been revealed to us that "Jade" is a registered trademark, and as a result, a rename is needed. After some discussion among the maintainers, **"Pug"** has been chosen as the new name for this project. The next major version will carry "pug" as the package name.
 
 If your package or app currently uses `jade`, don't worry: we have secured permissions to continue to occupy that package name, although all new versions will be released under `pug`.
 

From 4b50db0365c79a8400a9d48b4ef105ba84c75f2f Mon Sep 17 00:00:00 2001
From: Christopher Pappas <damassi.pappas@gmail.com>
Date: Wed, 2 May 2018 07:58:01 -0700
Subject: [PATCH 50/96] [pug-filters] do not silence errors when attempting to
 require filters (#3002)

---
 packages/pug-filters/lib/run-filter.js | 46 ++++++++++++--------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/packages/pug-filters/lib/run-filter.js b/packages/pug-filters/lib/run-filter.js
index fdffad338..a0cec0457 100644
--- a/packages/pug-filters/lib/run-filter.js
+++ b/packages/pug-filters/lib/run-filter.js
@@ -8,36 +8,34 @@ var resolve = require('resolve');
 module.exports = filter;
 function filter(name, str, options, currentDirectory, funcName) {
   funcName = funcName || 'render';
-  var tr;
+  var trPath;
   try {
     try {
-      tr = require(resolve.sync('jstransformer-' + name, {basedir: currentDirectory || process.cwd()}));
+      trPath = resolve.sync('jstransformer-' + name, {basedir: currentDirectory || process.cwd()});
     } catch (ex) {
-      tr = require('jstransformer-' + name);
+      trPath = require.resolve('jstransformer-' + name);
     }
-    tr = jstransformer(tr);
-  } catch (ex) {}
-  if (tr) {
-    // TODO: we may want to add a way for people to separately specify "locals"
-    var result = tr[funcName](str, options, options).body;
-    if (options && options.minify) {
-      try {
-        switch (tr.outputFormat) {
-          case 'js':
-            result = uglify.minify(result, {fromString: true}).code;
-            break;
-          case 'css':
-            result = new CleanCSS().minify(result).styles;
-            break;
-        }
-      } catch (ex) {
-        // better to fail to minify than output nothing
-      }
-    }
-    return result;
-  } else {
+  } catch (ex) {
     var err = new Error('unknown filter ":' + name + '"');
     err.code = 'UNKNOWN_FILTER';
     throw err;
   }
+  var tr = jstransformer(require(trPath));
+  // TODO: we may want to add a way for people to separately specify "locals"
+  var result = tr[funcName](str, options, options).body;
+  if (options && options.minify) {
+    try {
+      switch (tr.outputFormat) {
+        case 'js':
+          result = uglify.minify(result, {fromString: true}).code;
+          break;
+        case 'css':
+          result = new CleanCSS().minify(result).styles;
+          break;
+      }
+    } catch (ex) {
+      // better to fail to minify than output nothing
+    }
+  }
+  return result;
 }

From d69c479a11de1a0d9f4c3fc513ec79733c086040 Mon Sep 17 00:00:00 2001
From: Mike Sidorov <mikes.ekb@gmail.com>
Date: Mon, 14 May 2018 13:16:17 +0500
Subject: [PATCH 51/96] toJSON method should be called on object-like values
 only (#3006)

---
 packages/pug-runtime/index.js           | 3 ++-
 packages/pug-runtime/test/index.test.js | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/pug-runtime/index.js b/packages/pug-runtime/index.js
index d506ddb28..a156db358 100644
--- a/packages/pug-runtime/index.js
+++ b/packages/pug-runtime/index.js
@@ -132,7 +132,8 @@ function pug_attr(key, val, escaped, terse) {
   if (val === true) {
     return ' ' + (terse ? key : key + '="' + key + '"');
   }
-  if (typeof val.toJSON === 'function') {
+  var type = typeof val;
+  if ((type === 'object' || type === 'function') && typeof val.toJSON === 'function') {
     val = val.toJSON();
   }
   if (typeof val !== 'string') {
diff --git a/packages/pug-runtime/test/index.test.js b/packages/pug-runtime/test/index.test.js
index c729b0c82..416489f01 100644
--- a/packages/pug-runtime/test/index.test.js
+++ b/packages/pug-runtime/test/index.test.js
@@ -14,6 +14,12 @@ function addTest(name, fn) {
 }
 
 addTest('attr', function (attr) { // (key, val, escaped, terse)
+  var stringToJSON = String.prototype.toJSON;
+
+  String.prototype.toJSON = function() {
+    return JSON.stringify(this);
+  };
+
   // Boolean Attributes
   expect(attr('key', true, true, true)).toBe(' key');
   expect(attr('key', true, false, true)).toBe(' key');
@@ -63,6 +69,8 @@ addTest('attr', function (attr) { // (key, val, escaped, terse)
   expect(attr('key', 'foo>bar', false, true)).toBe(' key="foo>bar"');
   expect(attr('key', 'foo>bar', true, false)).toBe(' key="foo&gt;bar"');
   expect(attr('key', 'foo>bar', false, false)).toBe(' key="foo>bar"');
+
+  String.prototype.toJSON = stringToJSON;
 });
 
 addTest('attrs', function (attrs) { // (obj, terse)

From a01694b391a0d95af75aee2a3178aafba60f0826 Mon Sep 17 00:00:00 2001
From: Zearin <Zearin@users.noreply.github.com>
Date: Fri, 15 Jun 2018 07:46:00 -0400
Subject: [PATCH 52/96] Update README.md (#3022)

Lots of minor edits for phrasing, grammar, formatting, and clarity.
---
 README.md | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 404a53a1d..338f4f922 100644
--- a/README.md
+++ b/README.md
@@ -21,27 +21,30 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 
 ## Rename from "Jade"
 
-This project was formerly known as "Jade". However, it has been revealed to us that "Jade" is a registered trademark, and as a result, a rename is needed. After some discussion among the maintainers, **"Pug"** has been chosen as the new name for this project. The next major version will carry "pug" as the package name.
+This project was formerly known as "Jade". However, it was revealed to us that "Jade" is a registered trademark; as a result, a rename was needed. After some discussion among the maintainers, **"Pug"** was chosen as the new name for this project. As of version 2, "pug" is the official package name.
 
 If your package or app currently uses `jade`, don't worry: we have secured permissions to continue to occupy that package name, although all new versions will be released under `pug`.
 
-Before the renaming, we had already begun working on an incompatible Jade 2.0.0. We have then made it so that this new major version bump will coincide with the rename to Pug. Therefore, upgrading from Jade to Pug will be the same process as upgrading any other package with a major version bump. Currently, Pug 2.0.0 is still in beta stage, and there are several syntactic differences we have deprecated and removed. Such differences are documented at [#2305](https://github.com/pugjs/pug/issues/2305).
+Before the renaming, work had already begun on “Jade 2.0.0”. Therefore, the rename to Pug coincided with the major version bump. As a result, upgrading from Jade to Pug will be the same process as upgrading any other package with a major version bump. 
 
-The website and documentation for Pug are still being updated, but if you are new to Pug, you should get started with the new syntax and install the Pug package on npm.
+The syntax of Pug has several differences, deprecations, and removals compared to its predecessor. These differences are documented in [#2305](https://github.com/pugjs/pug/issues/2305).
+
+The website and documentation for Pug are still being updated. But if you are new to Pug, you should get started with the new syntax and install the Pug package from npm.
 
 ## Installation
 
 ### Package
 
-via npm:
+To use Pug in your own JavaScript projects:
 
 ```bash
 $ npm install pug
 ```
 
+
 ### Command Line
 
-After installing the latest version of [Node.js](http://nodejs.org/), install with:
+After installing the latest version of [Node.js](http://nodejs.org), install with:
 
 ```bash
 $ npm install pug-cli -g
@@ -55,7 +58,7 @@ $ pug --help
 
 ## Syntax
 
-Pug is a clean, whitespace sensitive syntax for writing html.  Here is a simple example:
+Pug is a clean, whitespace sensitive syntax for writing HTML.  Here is a simple example:
 
 ```pug
 doctype html
@@ -76,7 +79,7 @@ html(lang="en")
         strong focus on performance and powerful features.
 ```
 
-becomes
+Pug transforms the above to:
 
 
 ```html
@@ -120,11 +123,11 @@ var html = pug.renderFile('filename.pug', merge(options, locals));
 
  - `filename`  Used in exceptions, and required when using includes
  - `compileDebug`  When `false` no debug instrumentation is compiled
- - `pretty`    Add pretty-indentation whitespace to output _(false by default)_
+ - `pretty`    Add pretty-indentation whitespace to output _(`false` by default)_
 
 ## Browser Support
 
- The latest version of pug can be download for the browser in standalone form from [here](https://pugjs.org/js/pug.js).  It only supports the very latest browsers though, and is a large file.  It is recommended that you pre-compile your pug templates to JavaScript.
+The latest version of pug can be [downloaded for the browser in standalone form](https://pugjs.org/js/pug.js).  It only supports the very latest browsers, though, and is a large file.  It is recommended that you pre-compile your pug templates to JavaScript.
 
  To compile a template for use on the client using the command line, do:
 
@@ -144,7 +147,7 @@ which will produce `filename.js` containing the compiled template.
 
 ### Ports in other languages
 
-Ports with very close syntax, adapted to other languages:
+Ports to other languages, with very close syntax:
 
   - [PHP](https://github.com/pug-php/pug)
   - [Java](https://github.com/neuland/jade4j)
@@ -154,12 +157,11 @@ Ports with very close syntax, adapted to other languages:
 
 ### Equivalents in other languages
 
-
-Templates engines available in other languages with a different syntax but a similar philosophy:
+Templates engines for other languages with a different syntax, but a similar philosophy:
 
   - [Scaml for Scala](https://scalate.github.io/scalate/documentation/scaml-reference.html)
   - [Slim for Ruby](https://github.com/slim-template/slim) (should not be confused with Slim PHP framework)
-  - [HAML for Ruby](http://haml.info/)
+  - [HAML for Ruby](http://haml.info)
   
 ### Framework implementations/adapters
 
@@ -188,7 +190,7 @@ Embedded view engines for frameworks:
   - [html2pug](https://github.com/donpark/html2jade) converter
   - [pug2php](https://github.com/SE7ENSKY/jade2php) converter
   - [Pug Server](https://github.com/ctrlaltdev/pug-server) Ideal for building local prototypes apart from any application
-  - [cache-pug-templates](https://github.com/ladjs/cache-pug-templates) Cache Pug templates for [Lad](https://github.com/ladjs/lad)/[Koa](https://github.com/koajs/koa)/[Express](https://github.com/expressjs/express)/[Connect](https://github.com/senchalabs/connect) with [Redis](https://redis.io/)
+  - [cache-pug-templates](https://github.com/ladjs/cache-pug-templates) Cache Pug templates for [Lad](https://github.com/ladjs/lad)/[Koa](https://github.com/koajs/koa)/[Express](https://github.com/expressjs/express)/[Connect](https://github.com/senchalabs/connect) with [Redis](https://redis.io)
 
 
 ## Backers

From 3d8dc15d5898f08303f04bba0fd4d243acc70a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=9Awierk?= <j.swirus@gmail.com>
Date: Fri, 27 Jul 2018 09:30:37 +0200
Subject: [PATCH 53/96] Added "files" property to remove redundant files from
 packages. (#3038)

---
 .npmignore                               | 15 ---------------
 packages/pug-attrs/package.json          |  3 +++
 packages/pug-code-gen/package.json       |  3 +++
 packages/pug-filters/package.json        |  5 +++++
 packages/pug-lexer/package.json          |  3 +++
 packages/pug-linker/package.json         |  3 +++
 packages/pug-load/package.json           |  3 +++
 packages/pug-parser/package.json         |  4 ++++
 packages/pug-strip-comments/package.json |  3 +++
 packages/pug/package.json                |  4 ++++
 10 files changed, 31 insertions(+), 15 deletions(-)
 delete mode 100644 .npmignore

diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index f53cdc557..000000000
--- a/.npmignore
+++ /dev/null
@@ -1,15 +0,0 @@
-test
-support
-benchmarks
-examples
-lib-cov
-coverage
-.gitmodules
-.travis.yml
-History.md
-Makefile
-test/
-support/
-benchmarks/
-examples/
-docs/
diff --git a/packages/pug-attrs/package.json b/packages/pug-attrs/package.json
index 1ec46abb3..430746789 100644
--- a/packages/pug-attrs/package.json
+++ b/packages/pug-attrs/package.json
@@ -10,6 +10,9 @@
     "js-stringify": "^1.0.1",
     "pug-runtime": "^2.0.4"
   },
+  "files": [
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-attrs.git"
diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index a1d1644a0..2131ec12c 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -15,6 +15,9 @@
     "void-elements": "^2.0.1",
     "with": "^5.0.0"
   },
+  "files": [
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-code-gen.git"
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index f4a835966..ab640c0ff 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -26,6 +26,11 @@
     "pug-load": "^2.0.11",
     "pug-parser": "^5.0.0"
   },
+  "files": [
+    "lib/handle-filters.js",
+    "lib/run-filter.js",
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-filters.git"
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index 86dde2367..838cc46ed 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -13,6 +13,9 @@
   "devDependencies": {
     "acorn": "^3.0.4"
   },
+  "files": [
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-lexer.git"
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index 259825ae4..8a13f270d 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -14,6 +14,9 @@
     "pug-load": "^2.0.11",
     "pug-parser": "^5.0.0"
   },
+  "files": [
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-linker.git"
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index be30b165b..2f3743890 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -13,6 +13,9 @@
     "pug-lexer": "^4.0.0",
     "pug-parser": "^5.0.0"
   },
+  "files": [
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-load.git"
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index 9a4a7a9bb..16fc3dc42 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -12,6 +12,10 @@
   "devDependencies": {
     "get-repo": "^1.0.0"
   },
+  "files": [
+    "lib/inline-tags.js",
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-parser.git"
diff --git a/packages/pug-strip-comments/package.json b/packages/pug-strip-comments/package.json
index 17c7afee7..49d6b7423 100644
--- a/packages/pug-strip-comments/package.json
+++ b/packages/pug-strip-comments/package.json
@@ -11,6 +11,9 @@
   "devDependencies": {
     "line-json": "^1.0.0"
   },
+  "files": [
+    "index.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug-strip-comments.git"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index ea0aa4331..e84a4ece3 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -41,6 +41,10 @@
     "rimraf": "^2.2.8",
     "uglify-js": "github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
   },
+  "files": [
+    "lib/index.js",
+    "register.js"
+  ],
   "browser": {
     "fs": false
   },

From 2ead38c995a896fe0ff11c9c12f1c1fc25586bcf Mon Sep 17 00:00:00 2001
From: Serge Shkurko <shkurko1998@gmail.com>
Date: Fri, 3 Aug 2018 12:35:38 +0500
Subject: [PATCH 54/96] #3040 Fix preLex fire support for plugins (#3041)

---
 packages/pug/lib/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/pug/lib/index.js b/packages/pug/lib/index.js
index 36b40f64d..e76487d2c 100644
--- a/packages/pug/lib/index.js
+++ b/packages/pug/lib/index.js
@@ -96,7 +96,8 @@ function compileBody(str, options){
       }).map(function (plugin) {
         return plugin.lex;
       });
-      return applyPlugins(lex(str, lexOptions), options, plugins, 'postLex');
+      var contents = applyPlugins(str, {filename: options.filename}, plugins, 'preLex');
+      return applyPlugins(lex(contents, lexOptions), options, plugins, 'postLex');
     },
     parse: function (tokens, options) {
       tokens = tokens.map(function (token) {
@@ -146,9 +147,8 @@ function compileBody(str, options){
         contents = load.read(filename, loadOptions);
       }
 
-      var str = applyPlugins(contents, {filename: filename}, plugins, 'preLex');
-      debug_sources[filename] = str;
-      return str;
+      debug_sources[filename] = contents;
+      return contents;
     }
   });
   ast = applyPlugins(ast, options, plugins, 'postLoad');

From f7df3097cb44ca45297f177d4792a2cad148f1f4 Mon Sep 17 00:00:00 2001
From: Kyle <kylekatarnls@users.noreply.github.com>
Date: Wed, 8 Aug 2018 11:10:49 +0200
Subject: [PATCH 55/96] Add missing semicolon (#2919)

---
 packages/pug-load/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pug-load/index.js b/packages/pug-load/index.js
index 9cc5f0cea..9b12d3472 100644
--- a/packages/pug-load/index.js
+++ b/packages/pug-load/index.js
@@ -51,7 +51,7 @@ load.file = function loadFile(filename, options) {
   });
   var str = options.read(filename);
   return load.string(str, options);
-}
+};
 
 load.resolve = function resolve(filename, source, options) {
   filename = filename.trim();

From d4f605f14365347a0373ecf72b593ec46e5e7dc7 Mon Sep 17 00:00:00 2001
From: Liam Barry <WorksOfLiam@users.noreply.github.com>
Date: Fri, 21 Sep 2018 13:49:40 +0100
Subject: [PATCH 56/96] Include apug version in ports (#3053)

Hi!

I have started creating (and progressed quite well) a version of pug for a language called RPG (which runs on an IBM i & also works in C and COBOL) and was wondering if is allowed in the ports section?

Thanks for a great project!
Liam Barry
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 338f4f922..f29d1cbe9 100644
--- a/README.md
+++ b/README.md
@@ -154,6 +154,7 @@ Ports to other languages, with very close syntax:
   - [Python](https://github.com/kakulukia/pypugjs)
   - [Ruby](https://github.com/yivo/pug-ruby)
   - [C# (ASP.NET Core)](https://github.com/AspNetMonsters/pugzor)
+  - [RPG/ILE](https://github.com/WorksOfLiam/apug)
 
 ### Equivalents in other languages
 

From a1b046321416fc4ab297b43083ccda25ec8959e5 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Sat, 22 Sep 2018 10:41:30 +0100
Subject: [PATCH 57/96] Add note about tidelift

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f29d1cbe9..d471f8d35 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
  For discussion join the [chat room](https://gitter.im/pugjs/pug).
 
  You can test drive Pug online [here](https://pugjs.org/).
+ 
+ [https://tidelift.com/subscription/pkg/npm-pug?utm_source=npm-pug&utm_medium=referral&utm_campaign=readme](Professionally supported pug is now available)
 
  [![Build Status](https://img.shields.io/travis/pugjs/pug/master.svg?style=flat)](https://travis-ci.org/pugjs/pug)
  [![Coverage Status](https://img.shields.io/coveralls/pugjs/pug/master.svg?style=flat)](https://coveralls.io/r/pugjs/pug?branch=master)

From 74d26d6c4a5f6002e6d01c10b80248d6c949c1b5 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 24 Oct 2018 19:23:06 +0100
Subject: [PATCH 58/96] Fix tidelift link

I must have been tired
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d471f8d35..cd8fde1ff 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 
  You can test drive Pug online [here](https://pugjs.org/).
  
- [https://tidelift.com/subscription/pkg/npm-pug?utm_source=npm-pug&utm_medium=referral&utm_campaign=readme](Professionally supported pug is now available)
+ [Professionally supported pug is now available](https://tidelift.com/subscription/pkg/npm-pug?utm_source=npm-pug&utm_medium=referral&utm_campaign=readme)
 
  [![Build Status](https://img.shields.io/travis/pugjs/pug/master.svg?style=flat)](https://travis-ci.org/pugjs/pug)
  [![Coverage Status](https://img.shields.io/coveralls/pugjs/pug/master.svg?style=flat)](https://coveralls.io/r/pugjs/pug?branch=master)

From 6a634943287e0c2385f9b76d81dba97c13a44f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20F=C3=A4cke?= <serayaeryn@gmail.com>
Date: Mon, 11 Feb 2019 12:46:49 +0100
Subject: [PATCH 59/96] chore: update dev dependencies (#3108)

* update lerna
* update jest
* update coveralls
* add node 10 & 11 to travis ci
* removed node 4 from travis ci
---
 .travis.yml                                   |    3 +-
 lerna.json                                    |    2 +-
 package.json                                  |   12 +-
 .../__snapshots__/filter-aliases.test.js.snap |   25 +-
 .../test/__snapshots__/index.test.js.snap     | 1472 ++---
 ...ons-applied-to-nested-filters.test.js.snap |    9 +-
 .../test/__snapshots__/index.test.js.snap     |  803 +--
 .../test/__snapshots__/index.test.js.snap     |  220 +-
 .../test/__snapshots__/index.test.js.snap     |    8 +-
 .../test/__snapshots__/index.test.js.snap     |  891 +--
 .../no-unnecessary-blocks.test.js.snap        |    4 +-
 .../test/__snapshots__/index.test.js.snap     |   58 +-
 .../pug/test/__snapshots__/pug.test.js.snap   |   48 +-
 .../__snapshots__/index.test.js.snap          |    6 +-
 .../__snapshots__/index.test.js.snap          |    6 +-
 .../__snapshots__/index.test.js.snap          |    6 +-
 yarn.lock                                     | 4945 ++++++++++++-----
 17 files changed, 5269 insertions(+), 3249 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6ddd8e14..39f094817 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
 language: node_js
 node_js:
-  - "4"
   - "6"
   - "8"
+  - "10"
+  - "11"
 
 # Use faster Docker architecture on Travis.
 sudo: false
diff --git a/lerna.json b/lerna.json
index 7f5b1c80c..3059f1f32 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "lerna": "2.9.0",
+  "lerna": "3.10.8",
   "packages": ["packages/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
diff --git a/package.json b/package.json
index f31a0f7b3..4b0777a91 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "name": "pug-monorepo",
   "private": true,
   "devDependencies": {
-    "coveralls": "^2.11.2",
-    "jest": "^18.1.0",
-    "lerna": "2.9.0",
+    "coveralls": "3.0.2",
+    "jest": "24.0.0",
+    "lerna": "3.10.8",
     "prettier": "^1.3.1"
   },
   "repository": {
@@ -18,7 +18,7 @@
     "pretest": "lerna run pretest",
     "test": "jest",
     "coverage": "jest --coverage",
-    "coveralls": "npm run coverage && cat ./coverage/lcov.info | coveralls",
+    "coveralls": "jest --coverage --coverageReporters=text-lcov | coveralls",
     "watch": "jest --watch"
   },
   "jest": {
@@ -29,5 +29,7 @@
     ]
   },
   "license": "MIT",
-  "workspaces": ["packages/*"]
+  "workspaces": [
+    "packages/*"
+  ]
 }
diff --git a/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap b/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap
index 2130c6572..a4c74bc87 100644
--- a/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap
+++ b/packages/pug-filters/test/__snapshots__/filter-aliases.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test filters can be aliased 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`filters can be aliased 1`] = `
 Object {
   "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
   "line": 0,
@@ -67,7 +69,10 @@ Object {
                   "line": 3,
                   "name": "minify",
                   "type": "Text",
-                  "val": "function myFunc(n){return n}",
+                  "val": "function myFunc(n) {
+  return n;
+}
+",
                 },
               ],
               "type": "Block",
@@ -95,7 +100,7 @@ Object {
 }
 `;
 
-exports[`test options are applied before aliases 1`] = `
+exports[`options are applied before aliases 1`] = `
 Object {
   "filename": "<basedir>/packages/pug-filters/test/filter-aliases.test.js",
   "line": 0,
@@ -165,8 +170,9 @@ Object {
                   "name": "minify",
                   "type": "Text",
                   "val": "function myFunc(n) {
-    return n;
-}",
+  return n;
+}
+",
                 },
               ],
               "type": "Block",
@@ -237,7 +243,10 @@ Object {
                   "line": 7,
                   "name": "uglify-js",
                   "type": "Text",
-                  "val": "function myFunc(n){return n}",
+                  "val": "function myFunc(n) {
+  return n;
+}
+",
                 },
               ],
               "type": "Block",
@@ -265,11 +274,11 @@ Object {
 }
 `;
 
-exports[`test we do not support chains of aliases 1`] = `
+exports[`we do not support chains of aliases 1`] = `
 Object {
   "code": "PUG:FILTER_ALISE_CHAIN",
   "message": "<basedir>/packages/pug-filters/test/filter-aliases.test.js:3:9
 
-The filter \"minify-js\" is an alias for \"minify\", which is an alias for \"uglify-js\".  Pug does not support chains of filter aliases.",
+The filter \\"minify-js\\" is an alias for \\"minify\\", which is an alias for \\"uglify-js\\".  Pug does not support chains of filter aliases.",
 }
 `;
diff --git a/packages/pug-filters/test/__snapshots__/index.test.js.snap b/packages/pug-filters/test/__snapshots__/index.test.js.snap
index 720fd8014..74a2f4559 100644
--- a/packages/pug-filters/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-filters/test/__snapshots__/index.test.js.snap
@@ -1,1072 +1,1074 @@
-exports[`test cases/filters.cdata.input.json 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`cases/filters.cdata.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Code\",
-      \"val\": \"users = [{ name: \'tobi\', age: 2 }]\",
-      \"buffer\": false,
-      \"mustEscape\": false,
-      \"isInline\": false,
-      \"line\": 2,
-      \"filename\": \"filters.cdata.tokens.json\"
+      \\"type\\": \\"Code\\",
+      \\"val\\": \\"users = [{ name: 'tobi', age: 2 }]\\",
+      \\"buffer\\": false,
+      \\"mustEscape\\": false,
+      \\"isInline\\": false,
+      \\"line\\": 2,
+      \\"filename\\": \\"filters.cdata.tokens.json\\"
     },
     {
-      \"type\": \"Tag\",
-      \"name\": \"fb:users\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"fb:users\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Each\",
-            \"obj\": \"users\",
-            \"val\": \"user\",
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Each\\",
+            \\"obj\\": \\"users\\",
+            \\"val\\": \\"user\\",
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Tag\",
-                  \"name\": \"fb:user\",
-                  \"selfClosing\": false,
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Tag\\",
+                  \\"name\\": \\"fb:user\\",
+                  \\"selfClosing\\": false,
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"name\": \"cdata\",
-                        \"block\": {
-                          \"type\": \"Block\",
-                          \"nodes\": [
+                        \\"type\\": \\"Text\\",
+                        \\"name\\": \\"cdata\\",
+                        \\"block\\": {
+                          \\"type\\": \\"Block\\",
+                          \\"nodes\\": [
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"#{user.name}\",
-                              \"line\": 8
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"#{user.name}\\",
+                              \\"line\\": 8
                             }
                           ]
                         },
-                        \"attrs\": [],
-                        \"line\": 7,
-                        \"filename\": \"filters.cdata.tokens.json\",
-                        \"val\": \"<![CDATA[#{user.name}]]>\"
+                        \\"attrs\\": [],
+                        \\"line\\": 7,
+                        \\"filename\\": \\"filters.cdata.tokens.json\\",
+                        \\"val\\": \\"<![CDATA[#{user.name}]]>\\"
                       }
                     ]
                   },
-                  \"attrs\": [
+                  \\"attrs\\": [
                     {
-                      \"name\": \"age\",
-                      \"val\": \"user.age\",
-                      \"mustEscape\": true
+                      \\"name\\": \\"age\\",
+                      \\"val\\": \\"user.age\\",
+                      \\"mustEscape\\": true
                     }
                   ],
-                  \"attributeBlocks\": [],
-                  \"isInline\": false,
-                  \"line\": 6,
-                  \"filename\": \"filters.cdata.tokens.json\"
+                  \\"attributeBlocks\\": [],
+                  \\"isInline\\": false,
+                  \\"line\\": 6,
+                  \\"filename\\": \\"filters.cdata.tokens.json\\"
                 }
               ],
-              \"line\": 6,
-              \"filename\": \"filters.cdata.tokens.json\"
+              \\"line\\": 6,
+              \\"filename\\": \\"filters.cdata.tokens.json\\"
             },
-            \"line\": 5,
-            \"filename\": \"filters.cdata.tokens.json\"
+            \\"line\\": 5,
+            \\"filename\\": \\"filters.cdata.tokens.json\\"
           }
         ]
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 4,
-      \"filename\": \"filters.cdata.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 4,
+      \\"filename\\": \\"filters.cdata.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.cdata.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.cdata.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.coffeescript.input.json 1`] = `
+exports[`cases/filters.coffeescript.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"script\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"script\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Text\",
-            \"name\": \"coffee-script\",
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Text\\",
+            \\"name\\": \\"coffee-script\\",
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"val\": \"regexp = /\\\\n/\",
-                  \"line\": 3
+                  \\"type\\": \\"Text\\",
+                  \\"val\\": \\"regexp = /\\\\\\\\n/\\",
+                  \\"line\\": 3
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.coffeescript.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.coffeescript.tokens.json\\"
             },
-            \"attrs\": [],
-            \"line\": 2,
-            \"filename\": \"filters.coffeescript.tokens.json\",
-            \"val\": \"(function() {\\n  var regexp;\\n\\n  regexp = /\\\\n/;\\n\\n}).call(this);\\n\"
+            \\"attrs\\": [],
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.coffeescript.tokens.json\\",
+            \\"val\\": \\"(function() {\\\\n  var regexp;\\\\n\\\\n  regexp = /\\\\\\\\n/;\\\\n\\\\n}).call(this);\\\\n\\"
           },
           {
-            \"type\": \"Text\",
-            \"name\": \"coffee-script\",
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Text\\",
+            \\"name\\": \\"coffee-script\\",
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"val\": \"math =\",
-                  \"line\": 5
+                  \\"type\\": \\"Text\\",
+                  \\"val\\": \\"math =\\",
+                  \\"line\\": 5
                 },
                 {
-                  \"type\": \"Text\",
-                  \"val\": \"\\n\",
-                  \"line\": 6
+                  \\"type\\": \\"Text\\",
+                  \\"val\\": \\"\\\\n\\",
+                  \\"line\\": 6
                 },
                 {
-                  \"type\": \"Text\",
-                  \"val\": \"  square: (value) -> value * value\",
-                  \"line\": 6
+                  \\"type\\": \\"Text\\",
+                  \\"val\\": \\"  square: (value) -> value * value\\",
+                  \\"line\\": 6
                 }
               ],
-              \"line\": 4,
-              \"filename\": \"filters.coffeescript.tokens.json\"
+              \\"line\\": 4,
+              \\"filename\\": \\"filters.coffeescript.tokens.json\\"
             },
-            \"attrs\": [
+            \\"attrs\\": [
               {
-                \"name\": \"minify\",
-                \"val\": \"true\",
-                \"mustEscape\": true
+                \\"name\\": \\"minify\\",
+                \\"val\\": \\"true\\",
+                \\"mustEscape\\": true
               }
             ],
-            \"line\": 4,
-            \"filename\": \"filters.coffeescript.tokens.json\",
-            \"val\": \"(function(){}).call(this);\"
+            \\"line\\": 4,
+            \\"filename\\": \\"filters.coffeescript.tokens.json\\",
+            \\"val\\": \\"(function(){}).call(this);\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.coffeescript.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.coffeescript.tokens.json\\"
       },
-      \"attrs\": [
+      \\"attrs\\": [
         {
-          \"name\": \"type\",
-          \"val\": \"\'text/javascript\'\",
-          \"mustEscape\": true
+          \\"name\\": \\"type\\",
+          \\"val\\": \\"'text/javascript'\\",
+          \\"mustEscape\\": true
         }
       ],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.coffeescript.tokens.json\"
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.coffeescript.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.coffeescript.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.coffeescript.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.custom.input.json 1`] = `
+exports[`cases/filters.custom.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"html\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"html\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Tag\",
-            \"name\": \"body\",
-            \"selfClosing\": false,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Tag\\",
+            \\"name\\": \\"body\\",
+            \\"selfClosing\\": false,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"name\": \"custom\",
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Text\\",
+                  \\"name\\": \\"custom\\",
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"Line 1\",
-                        \"line\": 4
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"Line 1\\",
+                        \\"line\\": 4
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"\\n\",
-                        \"line\": 5
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"\\\\n\\",
+                        \\"line\\": 5
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"Line 2\",
-                        \"line\": 5
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"Line 2\\",
+                        \\"line\\": 5
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"\\n\",
-                        \"line\": 6
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"\\\\n\\",
+                        \\"line\\": 6
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"\",
-                        \"line\": 6
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"\\",
+                        \\"line\\": 6
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"\\n\",
-                        \"line\": 7
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"\\\\n\\",
+                        \\"line\\": 7
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"Line 4\",
-                        \"line\": 7
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"Line 4\\",
+                        \\"line\\": 7
                       }
                     ],
-                    \"line\": 3,
-                    \"filename\": \"filters.custom.tokens.json\"
+                    \\"line\\": 3,
+                    \\"filename\\": \\"filters.custom.tokens.json\\"
                   },
-                  \"attrs\": [
+                  \\"attrs\\": [
                     {
-                      \"name\": \"opt\",
-                      \"val\": \"\'val\'\",
-                      \"mustEscape\": true
+                      \\"name\\": \\"opt\\",
+                      \\"val\\": \\"'val'\\",
+                      \\"mustEscape\\": true
                     },
                     {
-                      \"name\": \"num\",
-                      \"val\": \"2\",
-                      \"mustEscape\": true
+                      \\"name\\": \\"num\\",
+                      \\"val\\": \\"2\\",
+                      \\"mustEscape\\": true
                     }
                   ],
-                  \"line\": 3,
-                  \"filename\": \"filters.custom.tokens.json\",
-                  \"val\": \"BEGINLine 1\\nLine 2\\n\\nLine 4END\"
+                  \\"line\\": 3,
+                  \\"filename\\": \\"filters.custom.tokens.json\\",
+                  \\"val\\": \\"BEGINLine 1\\\\nLine 2\\\\n\\\\nLine 4END\\"
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.custom.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.custom.tokens.json\\"
             },
-            \"attrs\": [],
-            \"attributeBlocks\": [],
-            \"isInline\": false,
-            \"line\": 2,
-            \"filename\": \"filters.custom.tokens.json\"
+            \\"attrs\\": [],
+            \\"attributeBlocks\\": [],
+            \\"isInline\\": false,
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.custom.tokens.json\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.custom.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.custom.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.custom.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.custom.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.custom.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.custom.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.include.custom.input.json 1`] = `
+exports[`cases/filters.include.custom.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"html\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"html\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Tag\",
-            \"name\": \"body\",
-            \"selfClosing\": false,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Tag\\",
+            \\"name\\": \\"body\\",
+            \\"selfClosing\\": false,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Tag\",
-                  \"name\": \"pre\",
-                  \"selfClosing\": false,
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Tag\\",
+                  \\"name\\": \\"pre\\",
+                  \\"selfClosing\\": false,
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"line\": 4,
-                        \"filename\": \"filters.include.custom.tokens.json\",
-                        \"val\": \"BEGINhtml\\n  body\\n    pre\\n      include:custom(opt=\'val\' num=2) filters.include.custom.pug\\nEND\"
+                        \\"type\\": \\"Text\\",
+                        \\"line\\": 4,
+                        \\"filename\\": \\"filters.include.custom.tokens.json\\",
+                        \\"val\\": \\"BEGINhtml\\\\n  body\\\\n    pre\\\\n      include:custom(opt='val' num=2) filters.include.custom.pug\\\\nEND\\"
                       }
                     ],
-                    \"line\": 3,
-                    \"filename\": \"filters.include.custom.tokens.json\"
+                    \\"line\\": 3,
+                    \\"filename\\": \\"filters.include.custom.tokens.json\\"
                   },
-                  \"attrs\": [],
-                  \"attributeBlocks\": [],
-                  \"isInline\": false,
-                  \"line\": 3,
-                  \"filename\": \"filters.include.custom.tokens.json\"
+                  \\"attrs\\": [],
+                  \\"attributeBlocks\\": [],
+                  \\"isInline\\": false,
+                  \\"line\\": 3,
+                  \\"filename\\": \\"filters.include.custom.tokens.json\\"
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.include.custom.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.include.custom.tokens.json\\"
             },
-            \"attrs\": [],
-            \"attributeBlocks\": [],
-            \"isInline\": false,
-            \"line\": 2,
-            \"filename\": \"filters.include.custom.tokens.json\"
+            \\"attrs\\": [],
+            \\"attributeBlocks\\": [],
+            \\"isInline\\": false,
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.include.custom.tokens.json\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.include.custom.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.include.custom.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.include.custom.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.include.custom.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.include.custom.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.include.custom.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.include.input.json 1`] = `
+exports[`cases/filters.include.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"html\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"html\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Tag\",
-            \"name\": \"body\",
-            \"selfClosing\": false,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Tag\\",
+            \\"name\\": \\"body\\",
+            \\"selfClosing\\": false,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"line\": 3,
-                  \"filename\": \"filters.include.tokens.json\",
-                  \"val\": \"<p>Just <em>some</em> markdown <strong>tests</strong>.</p>\\n<p>With new line.</p>\\n\"
+                  \\"type\\": \\"Text\\",
+                  \\"line\\": 3,
+                  \\"filename\\": \\"filters.include.tokens.json\\",
+                  \\"val\\": \\"<p>Just <em>some</em> markdown <strong>tests</strong>.</p>\\\\n<p>With new line.</p>\\\\n\\"
                 },
                 {
-                  \"type\": \"Tag\",
-                  \"name\": \"script\",
-                  \"selfClosing\": false,
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Tag\\",
+                  \\"name\\": \\"script\\",
+                  \\"selfClosing\\": false,
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"line\": 5,
-                        \"filename\": \"filters.include.tokens.json\",
-                        \"val\": \"(function(){}).call(this);\"
+                        \\"type\\": \\"Text\\",
+                        \\"line\\": 5,
+                        \\"filename\\": \\"filters.include.tokens.json\\",
+                        \\"val\\": \\"(function(){}).call(this);\\"
                       }
                     ],
-                    \"line\": 4,
-                    \"filename\": \"filters.include.tokens.json\"
+                    \\"line\\": 4,
+                    \\"filename\\": \\"filters.include.tokens.json\\"
                   },
-                  \"attrs\": [],
-                  \"attributeBlocks\": [],
-                  \"isInline\": false,
-                  \"line\": 4,
-                  \"filename\": \"filters.include.tokens.json\"
+                  \\"attrs\\": [],
+                  \\"attributeBlocks\\": [],
+                  \\"isInline\\": false,
+                  \\"line\\": 4,
+                  \\"filename\\": \\"filters.include.tokens.json\\"
                 },
                 {
-                  \"type\": \"Tag\",
-                  \"name\": \"script\",
-                  \"selfClosing\": false,
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Tag\\",
+                  \\"name\\": \\"script\\",
+                  \\"selfClosing\\": false,
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"line\": 7,
-                        \"filename\": \"filters.include.tokens.json\",
-                        \"val\": \"<![CDATA[(function() {\\n  var math;\\n\\n  math = {\\n    square: function(value) {\\n      return value * value;\\n    }\\n  };\\n\\n}).call(this);\\n]]>\"
+                        \\"type\\": \\"Text\\",
+                        \\"line\\": 7,
+                        \\"filename\\": \\"filters.include.tokens.json\\",
+                        \\"val\\": \\"<![CDATA[(function() {\\\\n  var math;\\\\n\\\\n  math = {\\\\n    square: function(value) {\\\\n      return value * value;\\\\n    }\\\\n  };\\\\n\\\\n}).call(this);\\\\n]]>\\"
                       }
                     ],
-                    \"line\": 6,
-                    \"filename\": \"filters.include.tokens.json\"
+                    \\"line\\": 6,
+                    \\"filename\\": \\"filters.include.tokens.json\\"
                   },
-                  \"attrs\": [],
-                  \"attributeBlocks\": [],
-                  \"isInline\": false,
-                  \"line\": 6,
-                  \"filename\": \"filters.include.tokens.json\"
+                  \\"attrs\\": [],
+                  \\"attributeBlocks\\": [],
+                  \\"isInline\\": false,
+                  \\"line\\": 6,
+                  \\"filename\\": \\"filters.include.tokens.json\\"
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.include.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.include.tokens.json\\"
             },
-            \"attrs\": [],
-            \"attributeBlocks\": [],
-            \"isInline\": false,
-            \"line\": 2,
-            \"filename\": \"filters.include.tokens.json\"
+            \\"attrs\\": [],
+            \\"attributeBlocks\\": [],
+            \\"isInline\\": false,
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.include.tokens.json\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.include.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.include.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.include.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.include.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.include.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.include.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.inline.input.json 1`] = `
+exports[`cases/filters.inline.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"p\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"p\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Text\",
-            \"val\": \"before \",
-            \"line\": 1,
-            \"filename\": \"filters.inline.tokens.json\"
+            \\"type\\": \\"Text\\",
+            \\"val\\": \\"before \\",
+            \\"line\\": 1,
+            \\"filename\\": \\"filters.inline.tokens.json\\"
           },
           {
-            \"type\": \"Text\",
-            \"name\": \"cdata\",
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Text\\",
+            \\"name\\": \\"cdata\\",
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"val\": \"inside\",
-                  \"line\": 1,
-                  \"filename\": \"filters.inline.tokens.json\"
+                  \\"type\\": \\"Text\\",
+                  \\"val\\": \\"inside\\",
+                  \\"line\\": 1,
+                  \\"filename\\": \\"filters.inline.tokens.json\\"
                 }
               ],
-              \"line\": 1,
-              \"filename\": \"filters.inline.tokens.json\"
+              \\"line\\": 1,
+              \\"filename\\": \\"filters.inline.tokens.json\\"
             },
-            \"attrs\": [],
-            \"line\": 1,
-            \"filename\": \"filters.inline.tokens.json\",
-            \"val\": \"<![CDATA[inside]]>\"
+            \\"attrs\\": [],
+            \\"line\\": 1,
+            \\"filename\\": \\"filters.inline.tokens.json\\",
+            \\"val\\": \\"<![CDATA[inside]]>\\"
           },
           {
-            \"type\": \"Text\",
-            \"val\": \" after\",
-            \"line\": 1,
-            \"filename\": \"filters.inline.tokens.json\"
+            \\"type\\": \\"Text\\",
+            \\"val\\": \\" after\\",
+            \\"line\\": 1,
+            \\"filename\\": \\"filters.inline.tokens.json\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.inline.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.inline.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.inline.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.inline.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.inline.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.inline.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.less.input.json 1`] = `
+exports[`cases/filters.less.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"html\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"html\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Tag\",
-            \"name\": \"head\",
-            \"selfClosing\": false,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Tag\\",
+            \\"name\\": \\"head\\",
+            \\"selfClosing\\": false,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Tag\",
-                  \"name\": \"style\",
-                  \"selfClosing\": false,
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Tag\\",
+                  \\"name\\": \\"style\\",
+                  \\"selfClosing\\": false,
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"name\": \"less\",
-                        \"block\": {
-                          \"type\": \"Block\",
-                          \"nodes\": [
+                        \\"type\\": \\"Text\\",
+                        \\"name\\": \\"less\\",
+                        \\"block\\": {
+                          \\"type\\": \\"Block\\",
+                          \\"nodes\\": [
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"@pad: 15px;\",
-                              \"line\": 5
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"@pad: 15px;\\",
+                              \\"line\\": 5
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"\\n\",
-                              \"line\": 6
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"\\\\n\\",
+                              \\"line\\": 6
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"body {\",
-                              \"line\": 6
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"body {\\",
+                              \\"line\\": 6
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"\\n\",
-                              \"line\": 7
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"\\\\n\\",
+                              \\"line\\": 7
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"  padding: @pad;\",
-                              \"line\": 7
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"  padding: @pad;\\",
+                              \\"line\\": 7
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"\\n\",
-                              \"line\": 8
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"\\\\n\\",
+                              \\"line\\": 8
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"}\",
-                              \"line\": 8
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"}\\",
+                              \\"line\\": 8
                             }
                           ],
-                          \"line\": 4,
-                          \"filename\": \"filters.less.tokens.json\"
+                          \\"line\\": 4,
+                          \\"filename\\": \\"filters.less.tokens.json\\"
                         },
-                        \"attrs\": [],
-                        \"line\": 4,
-                        \"filename\": \"filters.less.tokens.json\",
-                        \"val\": \"body {\\n  padding: 15px;\\n}\\n\"
+                        \\"attrs\\": [],
+                        \\"line\\": 4,
+                        \\"filename\\": \\"filters.less.tokens.json\\",
+                        \\"val\\": \\"body {\\\\n  padding: 15px;\\\\n}\\\\n\\"
                       }
                     ],
-                    \"line\": 3,
-                    \"filename\": \"filters.less.tokens.json\"
+                    \\"line\\": 3,
+                    \\"filename\\": \\"filters.less.tokens.json\\"
                   },
-                  \"attrs\": [
+                  \\"attrs\\": [
                     {
-                      \"name\": \"type\",
-                      \"val\": \"\\\"text/css\\\"\",
-                      \"mustEscape\": true
+                      \\"name\\": \\"type\\",
+                      \\"val\\": \\"\\\\\\"text/css\\\\\\"\\",
+                      \\"mustEscape\\": true
                     }
                   ],
-                  \"attributeBlocks\": [],
-                  \"isInline\": false,
-                  \"line\": 3,
-                  \"filename\": \"filters.less.tokens.json\"
+                  \\"attributeBlocks\\": [],
+                  \\"isInline\\": false,
+                  \\"line\\": 3,
+                  \\"filename\\": \\"filters.less.tokens.json\\"
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.less.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.less.tokens.json\\"
             },
-            \"attrs\": [],
-            \"attributeBlocks\": [],
-            \"isInline\": false,
-            \"line\": 2,
-            \"filename\": \"filters.less.tokens.json\"
+            \\"attrs\\": [],
+            \\"attributeBlocks\\": [],
+            \\"isInline\\": false,
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.less.tokens.json\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.less.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.less.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.less.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.less.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.less.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.less.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.markdown.input.json 1`] = `
+exports[`cases/filters.markdown.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"html\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"html\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Tag\",
-            \"name\": \"body\",
-            \"selfClosing\": false,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Tag\\",
+            \\"name\\": \\"body\\",
+            \\"selfClosing\\": false,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"name\": \"markdown-it\",
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Text\\",
+                  \\"name\\": \\"markdown-it\\",
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"This is _some_ awesome **markdown**\",
-                        \"line\": 4
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"This is _some_ awesome **markdown**\\",
+                        \\"line\\": 4
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"\\n\",
-                        \"line\": 5
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"\\\\n\\",
+                        \\"line\\": 5
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"whoop.\",
-                        \"line\": 5
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"whoop.\\",
+                        \\"line\\": 5
                       }
                     ],
-                    \"line\": 3,
-                    \"filename\": \"filters.markdown.tokens.json\"
+                    \\"line\\": 3,
+                    \\"filename\\": \\"filters.markdown.tokens.json\\"
                   },
-                  \"attrs\": [],
-                  \"line\": 3,
-                  \"filename\": \"filters.markdown.tokens.json\",
-                  \"val\": \"<p>This is <em>some</em> awesome <strong>markdown</strong>\\nwhoop.</p>\\n\"
+                  \\"attrs\\": [],
+                  \\"line\\": 3,
+                  \\"filename\\": \\"filters.markdown.tokens.json\\",
+                  \\"val\\": \\"<p>This is <em>some</em> awesome <strong>markdown</strong>\\\\nwhoop.</p>\\\\n\\"
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.markdown.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.markdown.tokens.json\\"
             },
-            \"attrs\": [],
-            \"attributeBlocks\": [],
-            \"isInline\": false,
-            \"line\": 2,
-            \"filename\": \"filters.markdown.tokens.json\"
+            \\"attrs\\": [],
+            \\"attributeBlocks\\": [],
+            \\"isInline\\": false,
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.markdown.tokens.json\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.markdown.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.markdown.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.markdown.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.markdown.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.markdown.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.markdown.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.nested.input.json 1`] = `
+exports[`cases/filters.nested.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"script\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"script\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Text\",
-            \"name\": \"cdata\",
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Text\\",
+            \\"name\\": \\"cdata\\",
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"name\": \"uglify-js\",
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Text\\",
+                  \\"name\\": \\"uglify-js\\",
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"(function() {\",
-                        \"line\": 3
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"(function() {\\",
+                        \\"line\\": 3
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"\\n\",
-                        \"line\": 4
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"\\\\n\\",
+                        \\"line\\": 4
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"  console.log(\'test\')\",
-                        \"line\": 4
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"  console.log('test')\\",
+                        \\"line\\": 4
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"\\n\",
-                        \"line\": 5
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"\\\\n\\",
+                        \\"line\\": 5
                       },
                       {
-                        \"type\": \"Text\",
-                        \"val\": \"})()\",
-                        \"line\": 5
+                        \\"type\\": \\"Text\\",
+                        \\"val\\": \\"})()\\",
+                        \\"line\\": 5
                       }
                     ],
-                    \"line\": 2,
-                    \"filename\": \"filters.nested.tokens.json\"
+                    \\"line\\": 2,
+                    \\"filename\\": \\"filters.nested.tokens.json\\"
                   },
-                  \"attrs\": [],
-                  \"line\": 2,
-                  \"filename\": \"filters.nested.tokens.json\",
-                  \"val\": \"!function(){console.log(\\\"test\\\")}();\"
+                  \\"attrs\\": [],
+                  \\"line\\": 2,
+                  \\"filename\\": \\"filters.nested.tokens.json\\",
+                  \\"val\\": \\"!function(){console.log(\\\\\\"test\\\\\\")}();\\"
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.nested.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.nested.tokens.json\\"
             },
-            \"attrs\": [],
-            \"line\": 2,
-            \"filename\": \"filters.nested.tokens.json\",
-            \"val\": \"<![CDATA[!function(){console.log(\\\"test\\\")}();]]>\"
+            \\"attrs\\": [],
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.nested.tokens.json\\",
+            \\"val\\": \\"<![CDATA[!function(){console.log(\\\\\\"test\\\\\\")}();]]>\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.nested.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.nested.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.nested.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.nested.tokens.json\\"
     },
     {
-      \"type\": \"Tag\",
-      \"name\": \"script\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"script\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Text\",
-            \"name\": \"cdata\",
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Text\\",
+            \\"name\\": \\"cdata\\",
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Text\",
-                  \"name\": \"uglify-js\",
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Text\\",
+                  \\"name\\": \\"uglify-js\\",
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"name\": \"coffee-script\",
-                        \"block\": {
-                          \"type\": \"Block\",
-                          \"nodes\": [
+                        \\"type\\": \\"Text\\",
+                        \\"name\\": \\"coffee-script\\",
+                        \\"block\\": {
+                          \\"type\\": \\"Block\\",
+                          \\"nodes\\": [
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"(->\",
-                              \"line\": 8
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"(->\\",
+                              \\"line\\": 8
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"\\n\",
-                              \"line\": 9
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"\\\\n\\",
+                              \\"line\\": 9
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"  console.log \'test\'\",
-                              \"line\": 9
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"  console.log 'test'\\",
+                              \\"line\\": 9
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"\\n\",
-                              \"line\": 10
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"\\\\n\\",
+                              \\"line\\": 10
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \")()\",
-                              \"line\": 10
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\")()\\",
+                              \\"line\\": 10
                             }
                           ],
-                          \"line\": 7,
-                          \"filename\": \"filters.nested.tokens.json\"
+                          \\"line\\": 7,
+                          \\"filename\\": \\"filters.nested.tokens.json\\"
                         },
-                        \"attrs\": [],
-                        \"line\": 7,
-                        \"filename\": \"filters.nested.tokens.json\",
-                        \"val\": \"(function() {\\n  (function() {\\n    return console.log(\'test\');\\n  })();\\n\\n}).call(this);\\n\"
+                        \\"attrs\\": [],
+                        \\"line\\": 7,
+                        \\"filename\\": \\"filters.nested.tokens.json\\",
+                        \\"val\\": \\"(function() {\\\\n  (function() {\\\\n    return console.log('test');\\\\n  })();\\\\n\\\\n}).call(this);\\\\n\\"
                       }
                     ],
-                    \"line\": 7,
-                    \"filename\": \"filters.nested.tokens.json\"
+                    \\"line\\": 7,
+                    \\"filename\\": \\"filters.nested.tokens.json\\"
                   },
-                  \"attrs\": [],
-                  \"line\": 7,
-                  \"filename\": \"filters.nested.tokens.json\",
-                  \"val\": \"(function(){!function(){console.log(\\\"test\\\")}()}).call(this);\"
+                  \\"attrs\\": [],
+                  \\"line\\": 7,
+                  \\"filename\\": \\"filters.nested.tokens.json\\",
+                  \\"val\\": \\"(function(){!function(){console.log(\\\\\\"test\\\\\\")}()}).call(this);\\"
                 }
               ],
-              \"line\": 7,
-              \"filename\": \"filters.nested.tokens.json\"
+              \\"line\\": 7,
+              \\"filename\\": \\"filters.nested.tokens.json\\"
             },
-            \"attrs\": [],
-            \"line\": 7,
-            \"filename\": \"filters.nested.tokens.json\",
-            \"val\": \"<![CDATA[(function(){!function(){console.log(\\\"test\\\")}()}).call(this);]]>\"
+            \\"attrs\\": [],
+            \\"line\\": 7,
+            \\"filename\\": \\"filters.nested.tokens.json\\",
+            \\"val\\": \\"<![CDATA[(function(){!function(){console.log(\\\\\\"test\\\\\\")}()}).call(this);]]>\\"
           }
         ],
-        \"line\": 6,
-        \"filename\": \"filters.nested.tokens.json\"
+        \\"line\\": 6,
+        \\"filename\\": \\"filters.nested.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 6,
-      \"filename\": \"filters.nested.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 6,
+      \\"filename\\": \\"filters.nested.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.nested.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.nested.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters.stylus.input.json 1`] = `
+exports[`cases/filters.stylus.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Tag\",
-      \"name\": \"html\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"html\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Tag\",
-            \"name\": \"head\",
-            \"selfClosing\": false,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Tag\\",
+            \\"name\\": \\"head\\",
+            \\"selfClosing\\": false,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Tag\",
-                  \"name\": \"style\",
-                  \"selfClosing\": false,
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Tag\\",
+                  \\"name\\": \\"style\\",
+                  \\"selfClosing\\": false,
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"name\": \"stylus\",
-                        \"block\": {
-                          \"type\": \"Block\",
-                          \"nodes\": [
+                        \\"type\\": \\"Text\\",
+                        \\"name\\": \\"stylus\\",
+                        \\"block\\": {
+                          \\"type\\": \\"Block\\",
+                          \\"nodes\\": [
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"body\",
-                              \"line\": 5
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"body\\",
+                              \\"line\\": 5
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"\\n\",
-                              \"line\": 6
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"\\\\n\\",
+                              \\"line\\": 6
                             },
                             {
-                              \"type\": \"Text\",
-                              \"val\": \"  padding: 50px\",
-                              \"line\": 6
+                              \\"type\\": \\"Text\\",
+                              \\"val\\": \\"  padding: 50px\\",
+                              \\"line\\": 6
                             }
                           ],
-                          \"line\": 4,
-                          \"filename\": \"filters.stylus.tokens.json\"
+                          \\"line\\": 4,
+                          \\"filename\\": \\"filters.stylus.tokens.json\\"
                         },
-                        \"attrs\": [],
-                        \"line\": 4,
-                        \"filename\": \"filters.stylus.tokens.json\",
-                        \"val\": \"body {\\n  padding: 50px;\\n}\\n\"
+                        \\"attrs\\": [],
+                        \\"line\\": 4,
+                        \\"filename\\": \\"filters.stylus.tokens.json\\",
+                        \\"val\\": \\"body {\\\\n  padding: 50px;\\\\n}\\\\n\\"
                       }
                     ],
-                    \"line\": 3,
-                    \"filename\": \"filters.stylus.tokens.json\"
+                    \\"line\\": 3,
+                    \\"filename\\": \\"filters.stylus.tokens.json\\"
                   },
-                  \"attrs\": [
+                  \\"attrs\\": [
                     {
-                      \"name\": \"type\",
-                      \"val\": \"\\\"text/css\\\"\",
-                      \"mustEscape\": true
+                      \\"name\\": \\"type\\",
+                      \\"val\\": \\"\\\\\\"text/css\\\\\\"\\",
+                      \\"mustEscape\\": true
                     }
                   ],
-                  \"attributeBlocks\": [],
-                  \"isInline\": false,
-                  \"line\": 3,
-                  \"filename\": \"filters.stylus.tokens.json\"
+                  \\"attributeBlocks\\": [],
+                  \\"isInline\\": false,
+                  \\"line\\": 3,
+                  \\"filename\\": \\"filters.stylus.tokens.json\\"
                 }
               ],
-              \"line\": 2,
-              \"filename\": \"filters.stylus.tokens.json\"
+              \\"line\\": 2,
+              \\"filename\\": \\"filters.stylus.tokens.json\\"
             },
-            \"attrs\": [],
-            \"attributeBlocks\": [],
-            \"isInline\": false,
-            \"line\": 2,
-            \"filename\": \"filters.stylus.tokens.json\"
+            \\"attrs\\": [],
+            \\"attributeBlocks\\": [],
+            \\"isInline\\": false,
+            \\"line\\": 2,
+            \\"filename\\": \\"filters.stylus.tokens.json\\"
           },
           {
-            \"type\": \"Tag\",
-            \"name\": \"body\",
-            \"selfClosing\": false,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [],
-              \"line\": 7,
-              \"filename\": \"filters.stylus.tokens.json\"
+            \\"type\\": \\"Tag\\",
+            \\"name\\": \\"body\\",
+            \\"selfClosing\\": false,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [],
+              \\"line\\": 7,
+              \\"filename\\": \\"filters.stylus.tokens.json\\"
             },
-            \"attrs\": [],
-            \"attributeBlocks\": [],
-            \"isInline\": false,
-            \"line\": 7,
-            \"filename\": \"filters.stylus.tokens.json\"
+            \\"attrs\\": [],
+            \\"attributeBlocks\\": [],
+            \\"isInline\\": false,
+            \\"line\\": 7,
+            \\"filename\\": \\"filters.stylus.tokens.json\\"
           }
         ],
-        \"line\": 1,
-        \"filename\": \"filters.stylus.tokens.json\"
+        \\"line\\": 1,
+        \\"filename\\": \\"filters.stylus.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters.stylus.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters.stylus.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters.stylus.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters.stylus.tokens.json\\"
 }"
 `;
 
-exports[`test cases/filters-empty.input.json 1`] = `
+exports[`cases/filters-empty.input.json 1`] = `
 "{
-  \"type\": \"Block\",
-  \"nodes\": [
+  \\"type\\": \\"Block\\",
+  \\"nodes\\": [
     {
-      \"type\": \"Code\",
-      \"val\": \"var users = [{ name: \'tobi\', age: 2 }]\",
-      \"buffer\": false,
-      \"mustEscape\": false,
-      \"isInline\": false,
-      \"line\": 1,
-      \"filename\": \"filters-empty.tokens.json\"
+      \\"type\\": \\"Code\\",
+      \\"val\\": \\"var users = [{ name: 'tobi', age: 2 }]\\",
+      \\"buffer\\": false,
+      \\"mustEscape\\": false,
+      \\"isInline\\": false,
+      \\"line\\": 1,
+      \\"filename\\": \\"filters-empty.tokens.json\\"
     },
     {
-      \"type\": \"Tag\",
-      \"name\": \"fb:users\",
-      \"selfClosing\": false,
-      \"block\": {
-        \"type\": \"Block\",
-        \"nodes\": [
+      \\"type\\": \\"Tag\\",
+      \\"name\\": \\"fb:users\\",
+      \\"selfClosing\\": false,
+      \\"block\\": {
+        \\"type\\": \\"Block\\",
+        \\"nodes\\": [
           {
-            \"type\": \"Each\",
-            \"obj\": \"users\",
-            \"val\": \"user\",
-            \"key\": null,
-            \"block\": {
-              \"type\": \"Block\",
-              \"nodes\": [
+            \\"type\\": \\"Each\\",
+            \\"obj\\": \\"users\\",
+            \\"val\\": \\"user\\",
+            \\"key\\": null,
+            \\"block\\": {
+              \\"type\\": \\"Block\\",
+              \\"nodes\\": [
                 {
-                  \"type\": \"Tag\",
-                  \"name\": \"fb:user\",
-                  \"selfClosing\": false,
-                  \"block\": {
-                    \"type\": \"Block\",
-                    \"nodes\": [
+                  \\"type\\": \\"Tag\\",
+                  \\"name\\": \\"fb:user\\",
+                  \\"selfClosing\\": false,
+                  \\"block\\": {
+                    \\"type\\": \\"Block\\",
+                    \\"nodes\\": [
                       {
-                        \"type\": \"Text\",
-                        \"name\": \"cdata\",
-                        \"block\": {
-                          \"type\": \"Block\",
-                          \"nodes\": [],
-                          \"line\": 6,
-                          \"filename\": \"filters-empty.tokens.json\"
+                        \\"type\\": \\"Text\\",
+                        \\"name\\": \\"cdata\\",
+                        \\"block\\": {
+                          \\"type\\": \\"Block\\",
+                          \\"nodes\\": [],
+                          \\"line\\": 6,
+                          \\"filename\\": \\"filters-empty.tokens.json\\"
                         },
-                        \"attrs\": [],
-                        \"line\": 6,
-                        \"filename\": \"filters-empty.tokens.json\",
-                        \"val\": \"<![CDATA[]]>\"
+                        \\"attrs\\": [],
+                        \\"line\\": 6,
+                        \\"filename\\": \\"filters-empty.tokens.json\\",
+                        \\"val\\": \\"<![CDATA[]]>\\"
                       }
                     ],
-                    \"line\": 5,
-                    \"filename\": \"filters-empty.tokens.json\"
+                    \\"line\\": 5,
+                    \\"filename\\": \\"filters-empty.tokens.json\\"
                   },
-                  \"attrs\": [
+                  \\"attrs\\": [
                     {
-                      \"name\": \"age\",
-                      \"val\": \"user.age\",
-                      \"mustEscape\": true
+                      \\"name\\": \\"age\\",
+                      \\"val\\": \\"user.age\\",
+                      \\"mustEscape\\": true
                     }
                   ],
-                  \"attributeBlocks\": [],
-                  \"isInline\": false,
-                  \"line\": 5,
-                  \"filename\": \"filters-empty.tokens.json\"
+                  \\"attributeBlocks\\": [],
+                  \\"isInline\\": false,
+                  \\"line\\": 5,
+                  \\"filename\\": \\"filters-empty.tokens.json\\"
                 }
               ],
-              \"line\": 5,
-              \"filename\": \"filters-empty.tokens.json\"
+              \\"line\\": 5,
+              \\"filename\\": \\"filters-empty.tokens.json\\"
             },
-            \"line\": 4,
-            \"filename\": \"filters-empty.tokens.json\"
+            \\"line\\": 4,
+            \\"filename\\": \\"filters-empty.tokens.json\\"
           }
         ],
-        \"line\": 3,
-        \"filename\": \"filters-empty.tokens.json\"
+        \\"line\\": 3,
+        \\"filename\\": \\"filters-empty.tokens.json\\"
       },
-      \"attrs\": [],
-      \"attributeBlocks\": [],
-      \"isInline\": false,
-      \"line\": 3,
-      \"filename\": \"filters-empty.tokens.json\"
+      \\"attrs\\": [],
+      \\"attributeBlocks\\": [],
+      \\"isInline\\": false,
+      \\"line\\": 3,
+      \\"filename\\": \\"filters-empty.tokens.json\\"
     }
   ],
-  \"line\": 0,
-  \"filename\": \"filters-empty.tokens.json\"
+  \\"line\\": 0,
+  \\"filename\\": \\"filters-empty.tokens.json\\"
 }"
 `;
 
-exports[`test errors/dynamic-option.input.json 1`] = `
+exports[`errors/dynamic-option.input.json 1`] = `
 Object {
   "code": "PUG:FILTER_OPTION_NOT_CONSTANT",
   "line": 2,
-  "msg": "\"opt\" is not constant. All filters are rendered compile-time so filter options must be constants.",
+  "msg": "\\"opt\\" is not constant. All filters are rendered compile-time so filter options must be constants.",
 }
 `;
diff --git a/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap b/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap
index c64988ced..b69c7cbba 100644
--- a/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap
+++ b/packages/pug-filters/test/__snapshots__/per-filter-options-applied-to-nested-filters.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test per filter options are applied, even to nested filters 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`per filter options are applied, even to nested filters 1`] = `
 Object {
   "filename": "<basedir>/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js",
   "line": 0,
@@ -68,8 +70,9 @@ Object {
                   "name": "uglify-js",
                   "type": "Text",
                   "val": "function myFunc(n) {
-    return n;
-}",
+  return n;
+}
+",
                 },
               ],
               "type": "Block",
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index 0484b309b..962d17d9a 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test attr-es2015.pug 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`attr-es2015.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -15,7 +17,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var avatar = \'219b77f9d21de75e81851b6b886057c7\'",
+    "val": "var avatar = '219b77f9d21de75e81851b6b886057c7'",
   },
   Object {
     "loc": Object {
@@ -137,7 +139,7 @@ Array [
 ]
 `;
 
-exports[`test attribute-invalid-expression.pug 1`] = `
+exports[`attribute-invalid-expression.pug 1`] = `
 Object {
   "code": "PUG:SYNTAX_ERROR",
   "column": 5,
@@ -146,7 +148,7 @@ Object {
 }
 `;
 
-exports[`test attrs.js.pug 1`] = `
+exports[`attrs.js.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -194,7 +196,10 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "function answer() { return 42; }",
+    "val": "function answer() {
+  return 42;
+}
+",
   },
   Object {
     "loc": Object {
@@ -254,7 +259,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/user/\' + id",
+    "val": "'/user/' + id",
   },
   Object {
     "loc": Object {
@@ -271,7 +276,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'button\'",
+    "val": "'button'",
   },
   Object {
     "loc": Object {
@@ -345,7 +350,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/user/\' + id",
+    "val": "'/user/' + id",
   },
   Object {
     "loc": Object {
@@ -362,7 +367,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'button\'",
+    "val": "'button'",
   },
   Object {
     "loc": Object {
@@ -436,7 +441,7 @@ Array [
     "mustEscape": true,
     "name": "key",
     "type": "attribute",
-    "val": "\'answer\'",
+    "val": "'answer'",
   },
   Object {
     "loc": Object {
@@ -527,7 +532,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "[\'class1\', \'class2\']",
+    "val": "['class1', 'class2']",
   },
   Object {
     "loc": Object {
@@ -616,7 +621,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "[\'class1\', \'class2\']",
+    "val": "['class1', 'class2']",
   },
   Object {
     "loc": Object {
@@ -690,7 +695,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/user/\' + id",
+    "val": "'/user/' + id",
   },
   Object {
     "loc": Object {
@@ -707,7 +712,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'button\'",
+    "val": "'button'",
   },
   Object {
     "loc": Object {
@@ -781,7 +786,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/user/\' + id",
+    "val": "'/user/' + id",
   },
   Object {
     "loc": Object {
@@ -798,7 +803,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'button\'",
+    "val": "'button'",
   },
   Object {
     "loc": Object {
@@ -872,7 +877,7 @@ Array [
     "mustEscape": true,
     "name": "key",
     "type": "attribute",
-    "val": "\'answer\'",
+    "val": "'answer'",
   },
   Object {
     "loc": Object {
@@ -963,7 +968,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "[\'class1\', \'class2\']",
+    "val": "['class1', 'class2']",
   },
   Object {
     "loc": Object {
@@ -1052,7 +1057,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "[\'class1\', \'class2\']",
+    "val": "['class1', 'class2']",
   },
   Object {
     "loc": Object {
@@ -1155,7 +1160,7 @@ Array [
       },
     },
     "type": "&attributes",
-    "val": "{foo: \'bar\'}",
+    "val": "{foo: 'bar'}",
   },
   Object {
     "loc": Object {
@@ -1292,7 +1297,7 @@ Array [
       },
     },
     "type": "&attributes",
-    "val": "{baz: \'baz\'}",
+    "val": "{baz: 'baz'}",
   },
   Object {
     "loc": Object {
@@ -1325,7 +1330,7 @@ Array [
 ]
 `;
 
-exports[`test attrs.pug 1`] = `
+exports[`attrs.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -1371,7 +1376,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/contact\'",
+    "val": "'/contact'",
   },
   Object {
     "loc": Object {
@@ -1460,7 +1465,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/save\'",
+    "val": "'/save'",
   },
   Object {
     "loc": Object {
@@ -1672,7 +1677,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'foo, bar, baz\'",
+    "val": "'foo, bar, baz'",
   },
   Object {
     "loc": Object {
@@ -1763,7 +1768,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'((foo))\'",
+    "val": "'((foo))'",
   },
   Object {
     "loc": Object {
@@ -1884,7 +1889,7 @@ Array [
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -2007,7 +2012,7 @@ Array [
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -2096,7 +2101,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\"class:\"",
+    "val": "\\"class:\\"",
   },
   Object {
     "loc": Object {
@@ -2170,7 +2175,7 @@ Array [
     "mustEscape": true,
     "name": "pattern",
     "type": "attribute",
-    "val": "\'\\\\S+\'",
+    "val": "'\\\\\\\\S+'",
   },
   Object {
     "loc": Object {
@@ -2244,7 +2249,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/contact\'",
+    "val": "'/contact'",
   },
   Object {
     "loc": Object {
@@ -2333,7 +2338,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/save\'",
+    "val": "'/save'",
   },
   Object {
     "loc": Object {
@@ -2545,7 +2550,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'foo, bar, baz\'",
+    "val": "'foo, bar, baz'",
   },
   Object {
     "loc": Object {
@@ -2636,7 +2641,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'((foo))\'",
+    "val": "'((foo))'",
   },
   Object {
     "loc": Object {
@@ -2757,7 +2762,7 @@ Array [
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -2880,7 +2885,7 @@ Array [
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -2969,7 +2974,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\"class:\"",
+    "val": "\\"class:\\"",
   },
   Object {
     "loc": Object {
@@ -3043,7 +3048,7 @@ Array [
     "mustEscape": true,
     "name": "pattern",
     "type": "attribute",
-    "val": "\'\\\\S+\'",
+    "val": "'\\\\\\\\S+'",
   },
   Object {
     "loc": Object {
@@ -3117,7 +3122,7 @@ Array [
     "mustEscape": true,
     "name": "terse",
     "type": "attribute",
-    "val": "\"true\"",
+    "val": "\\"true\\"",
   },
   Object {
     "loc": Object {
@@ -3782,7 +3787,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var attrs = {foo: \'bar\', bar: \'<baz>\'}",
+    "val": "var attrs = {foo: 'bar', bar: '<baz>'}",
   },
   Object {
     "loc": Object {
@@ -3886,7 +3891,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -3903,7 +3908,7 @@ Array [
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
-    "val": "\"bar\"",
+    "val": "\\"bar\\"",
   },
   Object {
     "loc": Object {
@@ -3977,7 +3982,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -3994,7 +3999,7 @@ Array [
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -4041,7 +4046,7 @@ Array [
 ]
 `;
 
-exports[`test attrs.unescaped.pug 1`] = `
+exports[`attrs.unescaped.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -4087,7 +4092,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/x-template\'",
+    "val": "'text/x-template'",
   },
   Object {
     "loc": Object {
@@ -4162,7 +4167,7 @@ Array [
     "mustEscape": false,
     "name": "id",
     "type": "attribute",
-    "val": "\'user-<%= user.id %>\'",
+    "val": "'user-<%= user.id %>'",
   },
   Object {
     "loc": Object {
@@ -4268,7 +4273,7 @@ Array [
 ]
 `;
 
-exports[`test attrs-data.pug 1`] = `
+exports[`attrs-data.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -4285,7 +4290,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var user = { name: \'tobi\' }",
+    "val": "var user = { name: 'tobi' }",
   },
   Object {
     "loc": Object {
@@ -4493,7 +4498,7 @@ Array [
     "mustEscape": true,
     "name": "data-username",
     "type": "attribute",
-    "val": "\'tobi\'",
+    "val": "'tobi'",
   },
   Object {
     "loc": Object {
@@ -4567,7 +4572,7 @@ Array [
     "mustEscape": true,
     "name": "data-escaped",
     "type": "attribute",
-    "val": "{message: \"Let\'s rock!\"}",
+    "val": "{message: \\"Let's rock!\\"}",
   },
   Object {
     "loc": Object {
@@ -4641,7 +4646,7 @@ Array [
     "mustEscape": true,
     "name": "data-ampersand",
     "type": "attribute",
-    "val": "{message: \"a quote: &quot; this & that\"}",
+    "val": "{message: \\"a quote: &quot; this & that\\"}",
   },
   Object {
     "loc": Object {
@@ -4762,7 +4767,7 @@ Array [
 ]
 `;
 
-exports[`test basic.pug 1`] = `
+exports[`basic.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -4899,7 +4904,7 @@ Array [
 ]
 `;
 
-exports[`test blanks.pug 1`] = `
+exports[`blanks.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -5094,7 +5099,7 @@ Array [
 ]
 `;
 
-exports[`test block-code.pug 1`] = `
+exports[`block-code.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -5137,7 +5142,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "list = [\"uno\", \"dos\", \"tres\",",
+    "val": "list = [\\"uno\\", \\"dos\\", \\"tres\\",",
   },
   Object {
     "loc": Object {
@@ -5166,7 +5171,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "        \"cuatro\", \"cinco\", \"seis\"];",
+    "val": "        \\"cuatro\\", \\"cinco\\", \\"seis\\"];",
   },
   Object {
     "loc": Object {
@@ -5507,7 +5512,7 @@ Array [
 ]
 `;
 
-exports[`test block-expansion.pug 1`] = `
+exports[`block-expansion.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -5612,7 +5617,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'#\'",
+    "val": "'#'",
   },
   Object {
     "loc": Object {
@@ -5730,7 +5735,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'#\'",
+    "val": "'#'",
   },
   Object {
     "loc": Object {
@@ -5822,7 +5827,7 @@ Array [
 ]
 `;
 
-exports[`test block-expansion.shorthands.pug 1`] = `
+exports[`block-expansion.shorthands.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -5988,7 +5993,7 @@ Array [
 ]
 `;
 
-exports[`test blockquote.pug 1`] = `
+exports[`blockquote.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -6140,7 +6145,7 @@ Array [
 ]
 `;
 
-exports[`test blocks-in-blocks.pug 1`] = `
+exports[`blocks-in-blocks.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -6277,7 +6282,7 @@ Array [
 ]
 `;
 
-exports[`test blocks-in-if.pug 1`] = `
+exports[`blocks-in-if.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -6686,7 +6691,7 @@ Array [
     "mustEscape": true,
     "name": "charset",
     "type": "attribute",
-    "val": "\'utf8\'",
+    "val": "'utf8'",
   },
   Object {
     "loc": Object {
@@ -6938,7 +6943,7 @@ Array [
 ]
 `;
 
-exports[`test case.pug 1`] = `
+exports[`case.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -7609,7 +7614,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var friend = \'Tim:G\'",
+    "val": "var friend = 'Tim:G'",
   },
   Object {
     "loc": Object {
@@ -7668,7 +7673,7 @@ Array [
       },
     },
     "type": "when",
-    "val": "\'Tim:G\'",
+    "val": "'Tim:G'",
   },
   Object {
     "loc": Object {
@@ -7741,7 +7746,7 @@ Array [
       },
     },
     "type": "when",
-    "val": "{tim: \'g\'}",
+    "val": "{tim: 'g'}",
   },
   Object {
     "loc": Object {
@@ -7846,7 +7851,7 @@ Array [
 ]
 `;
 
-exports[`test case-blocks.pug 1`] = `
+exports[`case-blocks.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -8281,7 +8286,7 @@ Array [
 ]
 `;
 
-exports[`test case-with-invalid-expression.pug 1`] = `
+exports[`case-with-invalid-expression.pug 1`] = `
 Object {
   "code": "PUG:SYNTAX_ERROR",
   "column": 22,
@@ -8290,7 +8295,7 @@ Object {
 }
 `;
 
-exports[`test case-with-no-expression.pug 1`] = `
+exports[`case-with-no-expression.pug 1`] = `
 Object {
   "code": "PUG:NO_CASE_EXPRESSION",
   "column": 5,
@@ -8299,7 +8304,7 @@ Object {
 }
 `;
 
-exports[`test classes.pug 1`] = `
+exports[`classes.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -8345,7 +8350,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "[\'foo\', \'bar\', \'baz\']",
+    "val": "['foo', 'bar', 'baz']",
   },
   Object {
     "loc": Object {
@@ -8434,7 +8439,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -8702,7 +8707,7 @@ Array [
 ]
 `;
 
-exports[`test classes-empty.pug 1`] = `
+exports[`classes-empty.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -8748,7 +8753,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'\'",
+    "val": "''",
   },
   Object {
     "loc": Object {
@@ -8929,7 +8934,7 @@ Array [
 ]
 `;
 
-exports[`test code.conditionals.pug 1`] = `
+exports[`code.conditionals.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -9677,7 +9682,7 @@ Array [
       },
     },
     "type": "if",
-    "val": "\'nested\'",
+    "val": "'nested'",
   },
   Object {
     "loc": Object {
@@ -9707,7 +9712,7 @@ Array [
       },
     },
     "type": "if",
-    "val": "\'works\'",
+    "val": "'works'",
   },
   Object {
     "loc": Object {
@@ -10211,7 +10216,7 @@ Array [
 ]
 `;
 
-exports[`test code.escape.pug 1`] = `
+exports[`code.escape.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -10243,7 +10248,7 @@ Array [
     },
     "mustEscape": true,
     "type": "code",
-    "val": "\'<script>\'",
+    "val": "'<script>'",
   },
   Object {
     "loc": Object {
@@ -10289,7 +10294,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "\'<script>\'",
+    "val": "'<script>'",
   },
   Object {
     "loc": Object {
@@ -10308,7 +10313,7 @@ Array [
 ]
 `;
 
-exports[`test code.iteration.pug 1`] = `
+exports[`code.iteration.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -10631,7 +10636,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'item-\' + i",
+    "val": "'item-' + i",
   },
   Object {
     "loc": Object {
@@ -10982,7 +10987,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var letters = [\'a\', \'b\', \'c\']",
+    "val": "var letters = ['a', 'b', 'c']",
   },
   Object {
     "loc": Object {
@@ -11399,7 +11404,7 @@ Array [
 ]
 `;
 
-exports[`test code.pug 1`] = `
+exports[`code.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -11523,7 +11528,7 @@ Array [
     },
     "mustEscape": true,
     "type": "code",
-    "val": "\'\'",
+    "val": "''",
   },
   Object {
     "loc": Object {
@@ -11823,7 +11828,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'\'",
+    "val": "''",
   },
   Object {
     "loc": Object {
@@ -12004,7 +12009,7 @@ Array [
 ]
 `;
 
-exports[`test comments.pug 1`] = `
+exports[`comments.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -12722,7 +12727,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "script(src=\'/lame.js\')",
+    "val": "script(src='/lame.js')",
   },
   Object {
     "loc": Object {
@@ -12901,7 +12906,7 @@ Array [
 ]
 `;
 
-exports[`test comments.source.pug 1`] = `
+exports[`comments.source.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -13169,7 +13174,7 @@ Array [
 ]
 `;
 
-exports[`test comments-in-case.pug 1`] = `
+exports[`comments-in-case.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -13275,7 +13280,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var s = \'this\'",
+    "val": "var s = 'this'",
   },
   Object {
     "loc": Object {
@@ -13364,7 +13369,7 @@ Array [
       },
     },
     "type": "when",
-    "val": "\'this\'",
+    "val": "'this'",
   },
   Object {
     "loc": Object {
@@ -13409,7 +13414,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "It\'s this!",
+    "val": "It's this!",
   },
   Object {
     "loc": Object {
@@ -13438,7 +13443,7 @@ Array [
       },
     },
     "type": "when",
-    "val": "\'that\'",
+    "val": "'that'",
   },
   Object {
     "loc": Object {
@@ -13483,7 +13488,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "It\'s that!",
+    "val": "It's that!",
   },
   Object {
     "loc": Object {
@@ -13558,7 +13563,7 @@ Array [
 ]
 `;
 
-exports[`test default-with-expression.pug 1`] = `
+exports[`default-with-expression.pug 1`] = `
 Object {
   "code": "PUG:DEFAULT_WITH_EXPRESSION",
   "column": 8,
@@ -13567,7 +13572,7 @@ Object {
 }
 `;
 
-exports[`test doctype.custom.pug 1`] = `
+exports[`doctype.custom.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -13601,7 +13606,7 @@ Array [
 ]
 `;
 
-exports[`test doctype.default.pug 1`] = `
+exports[`doctype.default.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -13767,7 +13772,7 @@ Array [
 ]
 `;
 
-exports[`test doctype.keyword.pug 1`] = `
+exports[`doctype.keyword.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -13801,7 +13806,7 @@ Array [
 ]
 `;
 
-exports[`test each.else.pug 1`] = `
+exports[`each.else.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -14059,7 +14064,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var users = [{ name: \'tobi\', friends: [\'loki\'] }, { name: \'loki\' }]",
+    "val": "var users = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]",
   },
   Object {
     "loc": Object {
@@ -14330,7 +14335,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var user = { name: \'tobi\', age: 10 }",
+    "val": "var user = { name: 'tobi', age: 10 }",
   },
   Object {
     "loc": Object {
@@ -14879,7 +14884,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "user.name = \'tobi\'",
+    "val": "user.name = 'tobi'",
   },
   Object {
     "loc": Object {
@@ -15140,7 +15145,7 @@ Array [
 ]
 `;
 
-exports[`test else-with-condition.pug 1`] = `
+exports[`else-with-condition.pug 1`] = `
 Object {
   "code": "PUG:ELSE_CONDITION",
   "column": 6,
@@ -15149,7 +15154,7 @@ Object {
 }
 `;
 
-exports[`test escape-chars.pug 1`] = `
+exports[`escape-chars.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -15207,7 +15212,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "var re = /\\d+/;",
+    "val": "var re = /\\\\d+/;",
   },
   Object {
     "loc": Object {
@@ -15240,7 +15245,7 @@ Array [
 ]
 `;
 
-exports[`test escape-test.pug 1`] = `
+exports[`escape-test.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -15450,7 +15455,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var txt = \'<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>\'",
+    "val": "var txt = '<param name=\\"flashvars\\" value=\\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\\"/>'",
   },
   Object {
     "loc": Object {
@@ -15542,7 +15547,7 @@ Array [
 ]
 `;
 
-exports[`test escaping-class-attribute.pug 1`] = `
+exports[`escaping-class-attribute.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -15588,7 +15593,7 @@ Array [
     "mustEscape": true,
     "name": "attr",
     "type": "attribute",
-    "val": "\"<%= bar %>\"",
+    "val": "\\"<%= bar %>\\"",
   },
   Object {
     "loc": Object {
@@ -15662,7 +15667,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\"<%= bar %>\"",
+    "val": "\\"<%= bar %>\\"",
   },
   Object {
     "loc": Object {
@@ -15736,7 +15741,7 @@ Array [
     "mustEscape": false,
     "name": "attr",
     "type": "attribute",
-    "val": "\"<%= bar %>\"",
+    "val": "\\"<%= bar %>\\"",
   },
   Object {
     "loc": Object {
@@ -15810,7 +15815,7 @@ Array [
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
-    "val": "\"<%= bar %>\"",
+    "val": "\\"<%= bar %>\\"",
   },
   Object {
     "loc": Object {
@@ -15884,7 +15889,7 @@ Array [
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
-    "val": "\"<%= bar %> lol rofl\"",
+    "val": "\\"<%= bar %> lol rofl\\"",
   },
   Object {
     "loc": Object {
@@ -15958,7 +15963,7 @@ Array [
     "mustEscape": false,
     "name": "class",
     "type": "attribute",
-    "val": "\"<%= bar %> lol rofl <%= lmao %>\"",
+    "val": "\\"<%= bar %> lol rofl <%= lmao %>\\"",
   },
   Object {
     "loc": Object {
@@ -16005,7 +16010,7 @@ Array [
 ]
 `;
 
-exports[`test extends-no-path.pug 1`] = `
+exports[`extends-no-path.pug 1`] = `
 Object {
   "code": "PUG:NO_EXTENDS_PATH",
   "column": 8,
@@ -16014,7 +16019,7 @@ Object {
 }
 `;
 
-exports[`test filter-in-include.pug 1`] = `
+exports[`filter-in-include.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -16076,7 +16081,7 @@ Array [
 ]
 `;
 
-exports[`test filters.coffeescript.pug 1`] = `
+exports[`filters.coffeescript.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -16122,7 +16127,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/javascript\'",
+    "val": "'text/javascript'",
   },
   Object {
     "loc": Object {
@@ -16195,7 +16200,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "regexp = /\\n/",
+    "val": "regexp = /\\\\n/",
   },
   Object {
     "loc": Object {
@@ -16388,7 +16393,7 @@ Array [
 ]
 `;
 
-exports[`test filters.custom.pug 1`] = `
+exports[`filters.custom.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -16494,7 +16499,7 @@ Array [
     "mustEscape": true,
     "name": "opt",
     "type": "attribute",
-    "val": "\'val\'",
+    "val": "'val'",
   },
   Object {
     "loc": Object {
@@ -16702,7 +16707,7 @@ Array [
 ]
 `;
 
-exports[`test filters.include.custom.pug 1`] = `
+exports[`filters.include.custom.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -16852,7 +16857,7 @@ Array [
     "mustEscape": true,
     "name": "opt",
     "type": "attribute",
-    "val": "\'val\'",
+    "val": "'val'",
   },
   Object {
     "loc": Object {
@@ -16959,7 +16964,7 @@ Array [
 ]
 `;
 
-exports[`test filters.include.pug 1`] = `
+exports[`filters.include.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -17405,7 +17410,7 @@ Array [
 ]
 `;
 
-exports[`test filters.inline.pug 1`] = `
+exports[`filters.inline.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -17527,7 +17532,7 @@ Array [
 ]
 `;
 
-exports[`test filters.less.pug 1`] = `
+exports[`filters.less.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -17633,7 +17638,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\"text/css\"",
+    "val": "\\"text/css\\"",
   },
   Object {
     "loc": Object {
@@ -17868,7 +17873,7 @@ Array [
 ]
 `;
 
-exports[`test filters.markdown.pug 1`] = `
+exports[`filters.markdown.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -18062,7 +18067,7 @@ Array [
 ]
 `;
 
-exports[`test filters.nested.pug 1`] = `
+exports[`filters.nested.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -18180,7 +18185,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "  console.log(\'test\')",
+    "val": "  console.log('test')",
   },
   Object {
     "loc": Object {
@@ -18370,7 +18375,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "  console.log \'test\'",
+    "val": "  console.log 'test'",
   },
   Object {
     "loc": Object {
@@ -18446,7 +18451,7 @@ Array [
 ]
 `;
 
-exports[`test filters.stylus.pug 1`] = `
+exports[`filters.stylus.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -18552,7 +18557,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\"text/css\"",
+    "val": "\\"text/css\\"",
   },
   Object {
     "loc": Object {
@@ -18744,7 +18749,7 @@ Array [
 ]
 `;
 
-exports[`test filters.verbatim.pug 1`] = `
+exports[`filters.verbatim.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -18938,7 +18943,7 @@ Array [
 ]
 `;
 
-exports[`test filters-empty.pug 1`] = `
+exports[`filters-empty.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -18955,7 +18960,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var users = [{ name: \'tobi\', age: 2 }]",
+    "val": "var users = [{ name: 'tobi', age: 2 }]",
   },
   Object {
     "loc": Object {
@@ -19182,7 +19187,7 @@ Array [
 ]
 `;
 
-exports[`test html.pug 1`] = `
+exports[`html.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -19570,7 +19575,7 @@ Array [
 ]
 `;
 
-exports[`test html5.pug 1`] = `
+exports[`html5.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -19645,7 +19650,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'checkbox\'",
+    "val": "'checkbox'",
   },
   Object {
     "loc": Object {
@@ -19736,7 +19741,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'checkbox\'",
+    "val": "'checkbox'",
   },
   Object {
     "loc": Object {
@@ -19827,7 +19832,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'checkbox\'",
+    "val": "'checkbox'",
   },
   Object {
     "loc": Object {
@@ -19877,7 +19882,7 @@ Array [
 ]
 `;
 
-exports[`test include.script.pug 1`] = `
+exports[`include.script.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -19938,7 +19943,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/x-template\'",
+    "val": "'text/x-template'",
   },
   Object {
     "loc": Object {
@@ -20029,7 +20034,7 @@ Array [
 ]
 `;
 
-exports[`test include.yield.nested.pug 1`] = `
+exports[`include.yield.nested.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -20194,7 +20199,7 @@ Array [
 ]
 `;
 
-exports[`test include-extends-from-root.pug 1`] = `
+exports[`include-extends-from-root.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -20256,7 +20261,7 @@ Array [
 ]
 `;
 
-exports[`test include-extends-of-common-template.pug 1`] = `
+exports[`include-extends-of-common-template.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -20361,7 +20366,7 @@ Array [
 ]
 `;
 
-exports[`test include-extends-relative.pug 1`] = `
+exports[`include-extends-relative.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -20423,7 +20428,7 @@ Array [
 ]
 `;
 
-exports[`test include-filter-no-path.pug 1`] = `
+exports[`include-filter-no-path.pug 1`] = `
 Object {
   "code": "PUG:NO_INCLUDE_PATH",
   "column": 12,
@@ -20432,7 +20437,7 @@ Object {
 }
 `;
 
-exports[`test include-filter-no-path-2.pug 1`] = `
+exports[`include-filter-no-path-2.pug 1`] = `
 Object {
   "code": "PUG:NO_INCLUDE_PATH",
   "column": 12,
@@ -20441,16 +20446,16 @@ Object {
 }
 `;
 
-exports[`test include-filter-no-space.pug 1`] = `
+exports[`include-filter-no-space.pug 1`] = `
 Object {
   "code": "PUG:UNEXPECTED_TEXT",
   "column": 14,
   "line": 1,
-  "msg": "unexpected text \"foo.£\"",
+  "msg": "unexpected text \\"foo.£\\"",
 }
 `;
 
-exports[`test include-no-path.pug 1`] = `
+exports[`include-no-path.pug 1`] = `
 Object {
   "code": "PUG:NO_INCLUDE_PATH",
   "column": 8,
@@ -20459,7 +20464,7 @@ Object {
 }
 `;
 
-exports[`test include-only-text.pug 1`] = `
+exports[`include-only-text.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -20698,7 +20703,7 @@ Array [
 ]
 `;
 
-exports[`test include-only-text-body.pug 1`] = `
+exports[`include-only-text-body.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -20713,7 +20718,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "The message is \"",
+    "val": "The message is \\"",
   },
   Object {
     "loc": Object {
@@ -20770,7 +20775,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "\"",
+    "val": "\\"",
   },
   Object {
     "loc": Object {
@@ -20803,7 +20808,7 @@ Array [
 ]
 `;
 
-exports[`test include-with-text.pug 1`] = `
+exports[`include-with-text.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -20923,7 +20928,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/caustic.js\'",
+    "val": "'/caustic.js'",
   },
   Object {
     "loc": Object {
@@ -20997,7 +21002,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/app.js\'",
+    "val": "'/app.js'",
   },
   Object {
     "loc": Object {
@@ -21058,7 +21063,7 @@ Array [
 ]
 `;
 
-exports[`test include-with-text-head.pug 1`] = `
+exports[`include-with-text-head.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -21134,7 +21139,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/javascript\'",
+    "val": "'text/javascript'",
   },
   Object {
     "loc": Object {
@@ -21191,7 +21196,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "alert(\'hello world\');",
+    "val": "alert('hello world');",
   },
   Object {
     "loc": Object {
@@ -21238,7 +21243,7 @@ Array [
 ]
 `;
 
-exports[`test includes.pug 1`] = `
+exports[`includes.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -21487,7 +21492,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\"text/javascript\"",
+    "val": "\\"text/javascript\\"",
   },
   Object {
     "loc": Object {
@@ -21607,7 +21612,7 @@ Array [
 ]
 `;
 
-exports[`test includes-with-ext-js.pug 1`] = `
+exports[`includes-with-ext-js.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -21743,7 +21748,7 @@ Array [
 ]
 `;
 
-exports[`test inconsistent-indentation.pug 1`] = `
+exports[`inconsistent-indentation.pug 1`] = `
 Object {
   "code": "PUG:INCONSISTENT_INDENTATION",
   "column": 1,
@@ -21752,7 +21757,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.alert-dialog.pug 1`] = `
+exports[`inheritance.alert-dialog.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -21914,7 +21919,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "I\'m an alert!",
+    "val": "I'm an alert!",
   },
   Object {
     "loc": Object {
@@ -21947,7 +21952,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.defaults.pug 1`] = `
+exports[`inheritance.defaults.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -22084,7 +22089,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'jquery.js\'",
+    "val": "'jquery.js'",
   },
   Object {
     "loc": Object {
@@ -22158,7 +22163,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'keymaster.js\'",
+    "val": "'keymaster.js'",
   },
   Object {
     "loc": Object {
@@ -22232,7 +22237,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'caustic.js\'",
+    "val": "'caustic.js'",
   },
   Object {
     "loc": Object {
@@ -22307,7 +22312,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.extend.include.pug 1`] = `
+exports[`inheritance.extend.include.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -22441,7 +22446,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'jquery.js\'",
+    "val": "'jquery.js'",
   },
   Object {
     "loc": Object {
@@ -22726,7 +22731,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.extend.mixins.block.pug 1`] = `
+exports[`inheritance.extend.mixins.block.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -22863,7 +22868,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.extend.mixins.pug 1`] = `
+exports[`inheritance.extend.mixins.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -23089,7 +23094,7 @@ Array [
     "val": 2,
   },
   Object {
-    "args": "\"The meaning of life\"",
+    "args": "\\"The meaning of life\\"",
     "loc": Object {
       "end": Object {
         "column": 34,
@@ -23194,7 +23199,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.extend.pug 1`] = `
+exports[`inheritance.extend.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -23328,7 +23333,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'jquery.js\'",
+    "val": "'jquery.js'",
   },
   Object {
     "loc": Object {
@@ -23494,7 +23499,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.extend.recursive.pug 1`] = `
+exports[`inheritance.extend.recursive.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -23631,7 +23636,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.extend.whitespace.pug 1`] = `
+exports[`inheritance.extend.whitespace.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -23765,7 +23770,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'jquery.js\'",
+    "val": "'jquery.js'",
   },
   Object {
     "loc": Object {
@@ -23931,7 +23936,7 @@ Array [
 ]
 `;
 
-exports[`test inheritance.pug 1`] = `
+exports[`inheritance.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -24065,7 +24070,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'jquery.js\'",
+    "val": "'jquery.js'",
   },
   Object {
     "loc": Object {
@@ -24231,7 +24236,7 @@ Array [
 ]
 `;
 
-exports[`test inline-block-comment.pug 1`] = `
+exports[`inline-block-comment.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -24388,7 +24393,7 @@ Array [
 ]
 `;
 
-exports[`test inline-tag.pug 1`] = `
+exports[`inline-tag.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -24740,7 +24745,7 @@ Array [
     },
     "mustEscape": true,
     "type": "code",
-    "val": "\'[foo]\'",
+    "val": "'[foo]'",
   },
   Object {
     "loc": Object {
@@ -24829,7 +24834,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var foo = \'foo]\'",
+    "val": "var foo = 'foo]'",
   },
   Object {
     "loc": Object {
@@ -25166,7 +25171,7 @@ Array [
     },
     "mustEscape": true,
     "type": "code",
-    "val": "\'[foo]\'",
+    "val": "'[foo]'",
   },
   Object {
     "loc": Object {
@@ -25255,7 +25260,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var foo = \'foo]\'",
+    "val": "var foo = 'foo]'",
   },
   Object {
     "loc": Object {
@@ -25520,7 +25525,7 @@ Array [
 ]
 `;
 
-exports[`test intepolated-elements.pug 1`] = `
+exports[`intepolated-elements.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -25625,7 +25630,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'#\'",
+    "val": "'#'",
   },
   Object {
     "loc": Object {
@@ -25642,7 +25647,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'rho--modifier\'",
+    "val": "'rho--modifier'",
   },
   Object {
     "loc": Object {
@@ -25819,7 +25824,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'#\'",
+    "val": "'#'",
   },
   Object {
     "loc": Object {
@@ -25836,7 +25841,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'rho--modifier\'",
+    "val": "'rho--modifier'",
   },
   Object {
     "loc": Object {
@@ -25998,7 +26003,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'#\'",
+    "val": "'#'",
   },
   Object {
     "loc": Object {
@@ -26015,7 +26020,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'rho--modifier\'",
+    "val": "'rho--modifier'",
   },
   Object {
     "loc": Object {
@@ -26092,7 +26097,7 @@ Array [
 ]
 `;
 
-exports[`test interpolated-call.pug 1`] = `
+exports[`interpolated-call.pug 1`] = `
 Object {
   "code": "PUG:BRACKET_MISMATCH",
   "column": 11,
@@ -26101,7 +26106,7 @@ Object {
 }
 `;
 
-exports[`test interpolated-mixin.pug 1`] = `
+exports[`interpolated-mixin.pug 1`] = `
 Array [
   Object {
     "args": "url",
@@ -26270,7 +26275,7 @@ Array [
     "type": "start-pug-interpolation",
   },
   Object {
-    "args": "\'http://www.bing.com\'",
+    "args": "'http://www.bing.com'",
     "loc": Object {
       "end": Object {
         "column": 51,
@@ -26331,7 +26336,7 @@ Array [
 ]
 `;
 
-exports[`test interpolation.escape.pug 1`] = `
+exports[`interpolation.escape.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -26525,7 +26530,7 @@ Array [
     },
     "mustEscape": true,
     "type": "interpolated-code",
-    "val": "\"is {\" + id + \"}\"",
+    "val": "\\"is {\\" + id + \\"}\\"",
   },
   Object {
     "loc": Object {
@@ -26558,7 +26563,7 @@ Array [
 ]
 `;
 
-exports[`test invalid-class-name-1.pug 1`] = `
+exports[`invalid-class-name-1.pug 1`] = `
 Object {
   "code": "PUG:INVALID_CLASS_NAME",
   "column": 1,
@@ -26567,7 +26572,7 @@ Object {
 }
 `;
 
-exports[`test invalid-class-name-2.pug 1`] = `
+exports[`invalid-class-name-2.pug 1`] = `
 Object {
   "code": "PUG:INVALID_CLASS_NAME",
   "column": 1,
@@ -26576,25 +26581,25 @@ Object {
 }
 `;
 
-exports[`test invalid-class-name-3.pug 1`] = `
+exports[`invalid-class-name-3.pug 1`] = `
 Object {
   "code": "PUG:INVALID_CLASS_NAME",
   "column": 1,
   "line": 1,
-  "msg": "\"ä\" is not a valid class name.  Class names can only contain \"_\", \"-\", a-z and 0-9, and must contain at least one of \"_\", or a-z",
+  "msg": "\\"ä\\" is not a valid class name.  Class names can only contain \\"_\\", \\"-\\", a-z and 0-9, and must contain at least one of \\"_\\", or a-z",
 }
 `;
 
-exports[`test invalid-id.pug 1`] = `
+exports[`invalid-id.pug 1`] = `
 Object {
   "code": "PUG:INVALID_ID",
   "column": 1,
   "line": 1,
-  "msg": "\"ä\" is not a valid ID.",
+  "msg": "\\"ä\\" is not a valid ID.",
 }
 `;
 
-exports[`test layout.append.pug 1`] = `
+exports[`layout.append.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -26728,7 +26733,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'foo.js\'",
+    "val": "'foo.js'",
   },
   Object {
     "loc": Object {
@@ -26802,7 +26807,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'bar.js\'",
+    "val": "'bar.js'",
   },
   Object {
     "loc": Object {
@@ -26849,7 +26854,7 @@ Array [
 ]
 `;
 
-exports[`test layout.append.without-block.pug 1`] = `
+exports[`layout.append.without-block.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -26983,7 +26988,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'foo.js\'",
+    "val": "'foo.js'",
   },
   Object {
     "loc": Object {
@@ -27057,7 +27062,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'bar.js\'",
+    "val": "'bar.js'",
   },
   Object {
     "loc": Object {
@@ -27104,7 +27109,7 @@ Array [
 ]
 `;
 
-exports[`test layout.multi.append.prepend.block.pug 1`] = `
+exports[`layout.multi.append.prepend.block.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -27644,7 +27649,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'jquery.js\'",
+    "val": "'jquery.js'",
   },
   Object {
     "loc": Object {
@@ -27749,7 +27754,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'foo.js\'",
+    "val": "'foo.js'",
   },
   Object {
     "loc": Object {
@@ -27796,7 +27801,7 @@ Array [
 ]
 `;
 
-exports[`test layout.prepend.pug 1`] = `
+exports[`layout.prepend.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -27930,7 +27935,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'foo.js\'",
+    "val": "'foo.js'",
   },
   Object {
     "loc": Object {
@@ -28004,7 +28009,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'bar.js\'",
+    "val": "'bar.js'",
   },
   Object {
     "loc": Object {
@@ -28051,7 +28056,7 @@ Array [
 ]
 `;
 
-exports[`test layout.prepend.without-block.pug 1`] = `
+exports[`layout.prepend.without-block.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -28185,7 +28190,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'foo.js\'",
+    "val": "'foo.js'",
   },
   Object {
     "loc": Object {
@@ -28259,7 +28264,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'bar.js\'",
+    "val": "'bar.js'",
   },
   Object {
     "loc": Object {
@@ -28306,7 +28311,7 @@ Array [
 ]
 `;
 
-exports[`test malformed-each.pug 1`] = `
+exports[`malformed-each.pug 1`] = `
 Object {
   "code": "PUG:MALFORMED_EACH",
   "column": 5,
@@ -28315,7 +28320,7 @@ Object {
 }
 `;
 
-exports[`test malformed-extend.pug 1`] = `
+exports[`malformed-extend.pug 1`] = `
 Object {
   "code": "PUG:MALFORMED_EXTENDS",
   "column": 7,
@@ -28324,7 +28329,7 @@ Object {
 }
 `;
 
-exports[`test malformed-include.pug 1`] = `
+exports[`malformed-include.pug 1`] = `
 Object {
   "code": "PUG:MALFORMED_INCLUDE",
   "column": 8,
@@ -28333,7 +28338,7 @@ Object {
 }
 `;
 
-exports[`test mismatched-inline-tag.pug 1`] = `
+exports[`mismatched-inline-tag.pug 1`] = `
 Object {
   "code": "PUG:NO_END_BRACKET",
   "column": 14,
@@ -28342,7 +28347,7 @@ Object {
 }
 `;
 
-exports[`test mismatched-tag-interpolation.pug 1`] = `
+exports[`mismatched-tag-interpolation.pug 1`] = `
 Object {
   "code": "PUG:NO_END_BRACKET",
   "column": 1,
@@ -28351,7 +28356,7 @@ Object {
 }
 `;
 
-exports[`test mixin.attrs.pug 1`] = `
+exports[`mixin.attrs.pug 1`] = `
 Array [
   Object {
     "args": "title",
@@ -29235,7 +29240,7 @@ Array [
     "type": "newline",
   },
   Object {
-    "args": "\'Section 1\'",
+    "args": "'Section 1'",
     "loc": Object {
       "end": Object {
         "column": 25,
@@ -29325,7 +29330,7 @@ Array [
     "type": "outdent",
   },
   Object {
-    "args": "\'Section 2\'",
+    "args": "'Section 2'",
     "loc": Object {
       "end": Object {
         "column": 25,
@@ -29399,7 +29404,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'menu.html\'",
+    "val": "'menu.html'",
   },
   Object {
     "loc": Object {
@@ -29416,7 +29421,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -29492,7 +29497,7 @@ Array [
     "type": "outdent",
   },
   Object {
-    "args": "\'Section 3\'",
+    "args": "'Section 3'",
     "loc": Object {
       "end": Object {
         "column": 21,
@@ -29536,7 +29541,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'#\'",
+    "val": "'#'",
   },
   Object {
     "loc": Object {
@@ -29671,7 +29676,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -29688,7 +29693,7 @@ Array [
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
-    "val": "\'end\'",
+    "val": "'end'",
   },
   Object {
     "loc": Object {
@@ -29705,7 +29710,7 @@ Array [
     "mustEscape": true,
     "name": "id",
     "type": "attribute",
-    "val": "\'Last\'",
+    "val": "'Last'",
   },
   Object {
     "loc": Object {
@@ -29722,7 +29727,7 @@ Array [
     "mustEscape": true,
     "name": "data-attr",
     "type": "attribute",
-    "val": "\'baz\'",
+    "val": "'baz'",
   },
   Object {
     "loc": Object {
@@ -29842,7 +29847,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "[\'class1\', \'class2\']",
+    "val": "['class1', 'class2']",
   },
   Object {
     "loc": Object {
@@ -29962,7 +29967,7 @@ Array [
     "mustEscape": true,
     "name": "attr1",
     "type": "attribute",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -29979,7 +29984,7 @@ Array [
     "mustEscape": true,
     "name": "attr2",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -30039,7 +30044,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var val = \'<biz>\'",
+    "val": "var val = '<biz>'",
   },
   Object {
     "loc": Object {
@@ -30070,7 +30075,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var classes = [\'foo\', \'bar\']",
+    "val": "var classes = ['foo', 'bar']",
   },
   Object {
     "loc": Object {
@@ -30131,7 +30136,7 @@ Array [
     "mustEscape": true,
     "name": "attr3",
     "type": "attribute",
-    "val": "\'baz\'",
+    "val": "'baz'",
   },
   Object {
     "loc": Object {
@@ -30350,7 +30355,7 @@ Array [
     "type": "outdent",
   },
   Object {
-    "args": "\'work\'",
+    "args": "'work'",
     "loc": Object {
       "end": Object {
         "column": 29,
@@ -30394,7 +30399,7 @@ Array [
     "mustEscape": true,
     "name": "data-profile",
     "type": "attribute",
-    "val": "\'profile\'",
+    "val": "'profile'",
   },
   Object {
     "loc": Object {
@@ -30411,7 +30416,7 @@ Array [
     "mustEscape": true,
     "name": "data-creator-name",
     "type": "attribute",
-    "val": "\'name\'",
+    "val": "'name'",
   },
   Object {
     "loc": Object {
@@ -30701,7 +30706,7 @@ Array [
     "mustEscape": true,
     "name": "attr3",
     "type": "attribute",
-    "val": "\"qux\"",
+    "val": "\\"qux\\"",
   },
   Object {
     "loc": Object {
@@ -30718,7 +30723,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\"baz\"",
+    "val": "\\"baz\\"",
   },
   Object {
     "loc": Object {
@@ -30750,10 +30755,10 @@ Array [
   },
   Object {
     "args": "
-\'1\',
-      \'2\',
-  \'3\',
-      \'4\'
+'1',
+      '2',
+  '3',
+      '4'
 ",
     "loc": Object {
       "end": Object {
@@ -30800,7 +30805,7 @@ Array [
 ]
 `;
 
-exports[`test mixin.block-tag-behaviour.pug 1`] = `
+exports[`mixin.block-tag-behaviour.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -31041,7 +31046,7 @@ Array [
     "val": 4,
   },
   Object {
-    "args": "\'Foo\'",
+    "args": "'Foo'",
     "loc": Object {
       "end": Object {
         "column": 20,
@@ -31098,7 +31103,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "I\'m article foo",
+    "val": "I'm article foo",
   },
   Object {
     "loc": Object {
@@ -31397,7 +31402,7 @@ Array [
     "val": 4,
   },
   Object {
-    "args": "\'Something\'",
+    "args": "'Something'",
     "loc": Object {
       "end": Object {
         "column": 26,
@@ -31453,7 +31458,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "I\'m a much longer",
+    "val": "I'm a much longer",
   },
   Object {
     "loc": Object {
@@ -31630,7 +31635,7 @@ Array [
 ]
 `;
 
-exports[`test mixin.blocks.pug 1`] = `
+exports[`mixin.blocks.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -31784,7 +31789,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var csrf_token_from_somewhere = \'hey\'",
+    "val": "var csrf_token_from_somewhere = 'hey'",
   },
   Object {
     "loc": Object {
@@ -31844,7 +31849,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'hidden\'",
+    "val": "'hidden'",
   },
   Object {
     "loc": Object {
@@ -31861,7 +31866,7 @@ Array [
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
-    "val": "\'_csrf\'",
+    "val": "'_csrf'",
   },
   Object {
     "loc": Object {
@@ -32011,7 +32016,7 @@ Array [
     "val": 4,
   },
   Object {
-    "args": "\'GET\', \'/search\'",
+    "args": "'GET', '/search'",
     "loc": Object {
       "end": Object {
         "column": 28,
@@ -32085,7 +32090,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text\'",
+    "val": "'text'",
   },
   Object {
     "loc": Object {
@@ -32102,7 +32107,7 @@ Array [
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
-    "val": "\'query\'",
+    "val": "'query'",
   },
   Object {
     "loc": Object {
@@ -32119,7 +32124,7 @@ Array [
     "mustEscape": true,
     "name": "placeholder",
     "type": "attribute",
-    "val": "\'Search\'",
+    "val": "'Search'",
   },
   Object {
     "loc": Object {
@@ -32193,7 +32198,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'submit\'",
+    "val": "'submit'",
   },
   Object {
     "loc": Object {
@@ -32210,7 +32215,7 @@ Array [
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
-    "val": "\'Search\'",
+    "val": "'Search'",
   },
   Object {
     "loc": Object {
@@ -32329,7 +32334,7 @@ Array [
     "val": 4,
   },
   Object {
-    "args": "\'POST\', \'/search\'",
+    "args": "'POST', '/search'",
     "loc": Object {
       "end": Object {
         "column": 29,
@@ -32403,7 +32408,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text\'",
+    "val": "'text'",
   },
   Object {
     "loc": Object {
@@ -32420,7 +32425,7 @@ Array [
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
-    "val": "\'query\'",
+    "val": "'query'",
   },
   Object {
     "loc": Object {
@@ -32437,7 +32442,7 @@ Array [
     "mustEscape": true,
     "name": "placeholder",
     "type": "attribute",
-    "val": "\'Search\'",
+    "val": "'Search'",
   },
   Object {
     "loc": Object {
@@ -32511,7 +32516,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'submit\'",
+    "val": "'submit'",
   },
   Object {
     "loc": Object {
@@ -32528,7 +32533,7 @@ Array [
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
-    "val": "\'Search\'",
+    "val": "'Search'",
   },
   Object {
     "loc": Object {
@@ -32647,7 +32652,7 @@ Array [
     "val": 4,
   },
   Object {
-    "args": "\'POST\', \'/search\'",
+    "args": "'POST', '/search'",
     "loc": Object {
       "end": Object {
         "column": 29,
@@ -33238,7 +33243,7 @@ Array [
     },
     "mustEscape": true,
     "type": "code",
-    "val": "\'123\'",
+    "val": "'123'",
   },
   Object {
     "loc": Object {
@@ -33257,7 +33262,7 @@ Array [
 ]
 `;
 
-exports[`test mixin.merge.pug 1`] = `
+exports[`mixin.merge.pug 1`] = `
 Array [
   Object {
     "args": null,
@@ -33586,7 +33591,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\"baz\"",
+    "val": "\\"baz\\"",
   },
   Object {
     "loc": Object {
@@ -33916,7 +33921,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\"hello\"",
+    "val": "\\"hello\\"",
   },
   Object {
     "loc": Object {
@@ -34006,7 +34011,7 @@ Array [
     "mustEscape": true,
     "name": "class",
     "type": "attribute",
-    "val": "\"world\"",
+    "val": "\\"world\\"",
   },
   Object {
     "loc": Object {
@@ -34095,7 +34100,7 @@ Array [
       },
     },
     "type": "&attributes",
-    "val": "{class: \"hello\"}",
+    "val": "{class: \\"hello\\"}",
   },
   Object {
     "loc": Object {
@@ -34128,7 +34133,7 @@ Array [
 ]
 `;
 
-exports[`test mixin-at-end-of-file.pug 1`] = `
+exports[`mixin-at-end-of-file.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -34265,7 +34270,7 @@ Array [
 ]
 `;
 
-exports[`test mixin-block-with-space.pug 1`] = `
+exports[`mixin-block-with-space.pug 1`] = `
 Array [
   Object {
     "args": "id",
@@ -34447,7 +34452,7 @@ Array [
 ]
 `;
 
-exports[`test mixin-hoist.pug 1`] = `
+exports[`mixin-hoist.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -34661,7 +34666,7 @@ Array [
 ]
 `;
 
-exports[`test mixin-via-include.pug 1`] = `
+exports[`mixin-via-include.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -34769,7 +34774,7 @@ Array [
 ]
 `;
 
-exports[`test mixins.pug 1`] = `
+exports[`mixins.pug 1`] = `
 Array [
   Object {
     "args": "title, str",
@@ -35240,8 +35245,8 @@ Array [
     "val": 4,
   },
   Object {
-    "args": "\'This\',
-            ((\'is regular, javascript\'))",
+    "args": "'This',
+            (('is regular, javascript'))",
     "loc": Object {
       "end": Object {
         "column": 42,
@@ -35657,7 +35662,7 @@ Array [
     },
     "mustEscape": true,
     "type": "code",
-    "val": "str + \'interpolated\'",
+    "val": "str + 'interpolated'",
   },
   Object {
     "loc": Object {
@@ -35688,7 +35693,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var suffix = \"bar\"",
+    "val": "var suffix = \\"bar\\"",
   },
   Object {
     "loc": Object {
@@ -35705,7 +35710,7 @@ Array [
     "type": "newline",
   },
   Object {
-    "args": "\'This is \'",
+    "args": "'This is '",
     "loc": Object {
       "end": Object {
         "column": 31,
@@ -35718,7 +35723,7 @@ Array [
       },
     },
     "type": "call",
-    "val": "#{\'foo\' + suffix}",
+    "val": "#{'foo' + suffix}",
   },
   Object {
     "loc": Object {
@@ -35751,7 +35756,7 @@ Array [
 ]
 `;
 
-exports[`test mixins.rest-args.pug 1`] = `
+exports[`mixins.rest-args.pug 1`] = `
 Array [
   Object {
     "args": "tag, ...items",
@@ -35921,7 +35926,7 @@ Array [
     "type": "outdent",
   },
   Object {
-    "args": "\'ul\', 1, 2, 3, 4",
+    "args": "'ul', 1, 2, 3, 4",
     "loc": Object {
       "end": Object {
         "column": 24,
@@ -35967,7 +35972,7 @@ Array [
 ]
 `;
 
-exports[`test mixins-unused.pug 1`] = `
+exports[`mixins-unused.pug 1`] = `
 Array [
   Object {
     "args": null,
@@ -36028,7 +36033,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "This isn\'t something we ever want to output",
+    "val": "This isn't something we ever want to output",
   },
   Object {
     "loc": Object {
@@ -36076,7 +36081,7 @@ Array [
 ]
 `;
 
-exports[`test multi-line-interpolation.pug 1`] = `
+exports[`multi-line-interpolation.pug 1`] = `
 Object {
   "code": "PUG:NO_END_BRACKET",
   "column": 65,
@@ -36085,7 +36090,7 @@ Object {
 }
 `;
 
-exports[`test namespaces.pug 1`] = `
+exports[`namespaces.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -36175,7 +36180,7 @@ Array [
     "mustEscape": true,
     "name": "fb:foo",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -36208,7 +36213,7 @@ Array [
 ]
 `;
 
-exports[`test nesting.pug 1`] = `
+exports[`nesting.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -36551,16 +36556,16 @@ Array [
 ]
 `;
 
-exports[`test old-prefixed-each.pug 1`] = `
+exports[`old-prefixed-each.pug 1`] = `
 Object {
   "code": "PUG:MALFORMED_EACH",
   "column": 3,
   "line": 2,
-  "msg": "Pug each and for should no longer be prefixed with a dash (\"-\"). They are pug keywords and not part of JavaScript.",
+  "msg": "Pug each and for should no longer be prefixed with a dash (\\"-\\"). They are pug keywords and not part of JavaScript.",
 }
 `;
 
-exports[`test open-interpolation.pug 1`] = `
+exports[`open-interpolation.pug 1`] = `
 Object {
   "code": "PUG:NO_END_BRACKET",
   "column": 54,
@@ -36569,7 +36574,7 @@ Object {
 }
 `;
 
-exports[`test pipeless-comments.pug 1`] = `
+exports[`pipeless-comments.pug 1`] = `
 Array [
   Object {
     "buffer": true,
@@ -36705,7 +36710,7 @@ Array [
 ]
 `;
 
-exports[`test pipeless-filters.pug 1`] = `
+exports[`pipeless-filters.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -36840,7 +36845,7 @@ Array [
 ]
 `;
 
-exports[`test pipeless-tag.pug 1`] = `
+exports[`pipeless-tag.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -36944,7 +36949,7 @@ Array [
     },
     "mustEscape": true,
     "type": "interpolated-code",
-    "val": "\'going\'",
+    "val": "'going'",
   },
   Object {
     "loc": Object {
@@ -36990,7 +36995,7 @@ Array [
     },
     "mustEscape": true,
     "type": "interpolated-code",
-    "val": "\'on\'",
+    "val": "'on'",
   },
   Object {
     "loc": Object {
@@ -37052,7 +37057,7 @@ Array [
 ]
 `;
 
-exports[`test pre.pug 1`] = `
+exports[`pre.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -37418,7 +37423,7 @@ Array [
 ]
 `;
 
-exports[`test quotes.pug 1`] = `
+exports[`quotes.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -37448,7 +37453,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "\"foo\"",
+    "val": "\\"foo\\"",
   },
   Object {
     "loc": Object {
@@ -37492,7 +37497,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -37511,7 +37516,7 @@ Array [
 ]
 `;
 
-exports[`test regression.784.pug 1`] = `
+exports[`regression.784.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -37528,7 +37533,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var url = \'http://www.google.com\'",
+    "val": "var url = 'http://www.google.com'",
   },
   Object {
     "loc": Object {
@@ -37574,7 +37579,7 @@ Array [
     },
     "mustEscape": true,
     "type": "interpolated-code",
-    "val": "url.replace(\'http://\', \'\').replace(/^www\\./, \'\')",
+    "val": "url.replace('http://', '').replace(/^www\\\\./, '')",
   },
   Object {
     "loc": Object {
@@ -37593,7 +37598,7 @@ Array [
 ]
 `;
 
-exports[`test regression.1794.pug 1`] = `
+exports[`regression.1794.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -37729,7 +37734,7 @@ Array [
 ]
 `;
 
-exports[`test script.whitespace.pug 1`] = `
+exports[`script.whitespace.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -37936,7 +37941,7 @@ Array [
 ]
 `;
 
-exports[`test scripts.non-js.pug 1`] = `
+exports[`scripts.non-js.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -37997,7 +38002,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/template\'",
+    "val": "'text/template'",
   },
   Object {
     "loc": Object {
@@ -38219,7 +38224,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/template\'",
+    "val": "'text/template'",
   },
   Object {
     "loc": Object {
@@ -38367,7 +38372,7 @@ Array [
 ]
 `;
 
-exports[`test scripts.pug 1`] = `
+exports[`scripts.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -38543,7 +38548,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "\'foo()\'",
+    "val": "'foo()'",
   },
   Object {
     "loc": Object {
@@ -38664,7 +38669,7 @@ Array [
 ]
 `;
 
-exports[`test self-closing-html.pug 1`] = `
+exports[`self-closing-html.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -38829,7 +38834,7 @@ Array [
 ]
 `;
 
-exports[`test single-period.pug 1`] = `
+exports[`single-period.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -38878,7 +38883,7 @@ Array [
 ]
 `;
 
-exports[`test source.pug 1`] = `
+exports[`source.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -38954,7 +38959,7 @@ Array [
     "mustEscape": true,
     "name": "preload",
     "type": "attribute",
-    "val": "\'auto\'",
+    "val": "'auto'",
   },
   Object {
     "loc": Object {
@@ -39063,7 +39068,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -39137,7 +39142,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -39198,7 +39203,7 @@ Array [
 ]
 `;
 
-exports[`test styles.pug 1`] = `
+exports[`styles.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -39478,7 +39483,7 @@ Array [
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
-    "val": "\'color:red;background:green\'",
+    "val": "'color:red;background:green'",
   },
   Object {
     "loc": Object {
@@ -39552,7 +39557,7 @@ Array [
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
-    "val": "{color: \'red\', background: \'green\'}",
+    "val": "{color: 'red', background: 'green'}",
   },
   Object {
     "loc": Object {
@@ -39610,7 +39615,7 @@ Array [
       },
     },
     "type": "&attributes",
-    "val": "{style: \'color:red;background:green\'}",
+    "val": "{style: 'color:red;background:green'}",
   },
   Object {
     "loc": Object {
@@ -39654,7 +39659,7 @@ Array [
       },
     },
     "type": "&attributes",
-    "val": "{style: {color: \'red\', background: \'green\'}}",
+    "val": "{style: {color: 'red', background: 'green'}}",
   },
   Object {
     "loc": Object {
@@ -39790,7 +39795,7 @@ Array [
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
-    "val": "\'color:red;background:green\'",
+    "val": "'color:red;background:green'",
   },
   Object {
     "loc": Object {
@@ -39865,7 +39870,7 @@ Array [
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
-    "val": "{color: \'red\', background: \'green\'}",
+    "val": "{color: 'red', background: 'green'}",
   },
   Object {
     "loc": Object {
@@ -39910,7 +39915,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var bg = \'green\';",
+    "val": "var bg = 'green';",
   },
   Object {
     "loc": Object {
@@ -39970,7 +39975,7 @@ Array [
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
-    "val": "{color: \'red\', background: bg}",
+    "val": "{color: 'red', background: bg}",
   },
   Object {
     "loc": Object {
@@ -40028,7 +40033,7 @@ Array [
       },
     },
     "type": "&attributes",
-    "val": "{style: {color: \'red\', background: bg}}",
+    "val": "{style: {color: 'red', background: bg}}",
   },
   Object {
     "loc": Object {
@@ -40089,7 +40094,7 @@ Array [
     "mustEscape": true,
     "name": "style",
     "type": "attribute",
-    "val": "{color: \'red\', background: bg}",
+    "val": "{color: 'red', background: bg}",
   },
   Object {
     "loc": Object {
@@ -40150,7 +40155,7 @@ Array [
 ]
 `;
 
-exports[`test tag.interpolation.pug 1`] = `
+exports[`tag.interpolation.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -40181,7 +40186,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var tag = \'p\'",
+    "val": "var tag = 'p'",
   },
   Object {
     "loc": Object {
@@ -40212,7 +40217,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var foo = \'bar\'",
+    "val": "var foo = 'bar'",
   },
   Object {
     "loc": Object {
@@ -40316,7 +40321,7 @@ Array [
     "mustEscape": true,
     "name": "foo",
     "type": "attribute",
-    "val": "\'bar\'",
+    "val": "'bar'",
   },
   Object {
     "loc": Object {
@@ -40374,7 +40379,7 @@ Array [
       },
     },
     "type": "interpolation",
-    "val": "foo ? \'a\' : \'li\'",
+    "val": "foo ? 'a' : 'li'",
   },
   Object {
     "loc": Object {
@@ -40982,7 +40987,7 @@ Array [
     "val": 2,
   },
   Object {
-    "args": "\'contact\'",
+    "args": "'contact'",
     "loc": Object {
       "end": Object {
         "column": 19,
@@ -41071,7 +41076,7 @@ Array [
     "mustEscape": true,
     "name": "href",
     "type": "attribute",
-    "val": "\'/contact\'",
+    "val": "'/contact'",
   },
   Object {
     "loc": Object {
@@ -41133,7 +41138,7 @@ Array [
 ]
 `;
 
-exports[`test tag-blocks.pug 1`] = `
+exports[`tag-blocks.pug 1`] = `
 Array [
   Object {
     "buffer": true,
@@ -41314,7 +41319,7 @@ Array [
     },
     "mustEscape": true,
     "type": "code",
-    "val": "\'  \'",
+    "val": "'  '",
   },
   Object {
     "loc": Object {
@@ -41376,7 +41381,7 @@ Array [
 ]
 `;
 
-exports[`test tags.self-closing.pug 1`] = `
+exports[`tags.self-closing.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -41495,7 +41500,7 @@ Array [
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
-    "val": "\'baz\'",
+    "val": "'baz'",
   },
   Object {
     "loc": Object {
@@ -41612,7 +41617,7 @@ Array [
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
-    "val": "\'baz\'",
+    "val": "'baz'",
   },
   Object {
     "loc": Object {
@@ -41744,7 +41749,7 @@ Array [
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
-    "val": "\'baz\'",
+    "val": "'baz'",
   },
   Object {
     "loc": Object {
@@ -41802,7 +41807,7 @@ Array [
       },
     },
     "type": "interpolation",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -41845,7 +41850,7 @@ Array [
       },
     },
     "type": "interpolation",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -41876,7 +41881,7 @@ Array [
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
-    "val": "\'baz\'",
+    "val": "'baz'",
   },
   Object {
     "loc": Object {
@@ -41933,7 +41938,7 @@ Array [
       },
     },
     "type": "interpolation",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -41977,7 +41982,7 @@ Array [
       },
     },
     "type": "interpolation",
-    "val": "\'foo\'",
+    "val": "'foo'",
   },
   Object {
     "loc": Object {
@@ -42008,7 +42013,7 @@ Array [
     "mustEscape": true,
     "name": "bar",
     "type": "attribute",
-    "val": "\'baz\'",
+    "val": "'baz'",
   },
   Object {
     "loc": Object {
@@ -42215,7 +42220,7 @@ Array [
     },
     "type": "interpolation",
     "val": "
-    \'foo\'
+    'foo'
   ",
   },
   Object {
@@ -42263,7 +42268,7 @@ Array [
 ]
 `;
 
-exports[`test template.pug 1`] = `
+exports[`template.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -42309,7 +42314,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/x-template\'",
+    "val": "'text/x-template'",
   },
   Object {
     "loc": Object {
@@ -42516,7 +42521,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text/x-template\'",
+    "val": "'text/x-template'",
   },
   Object {
     "loc": Object {
@@ -42664,7 +42669,7 @@ Array [
 ]
 `;
 
-exports[`test text.pug 1`] = `
+exports[`text.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -42710,7 +42715,7 @@ Array [
     "mustEscape": true,
     "name": "value",
     "type": "attribute",
-    "val": "\'\'",
+    "val": "''",
   },
   Object {
     "loc": Object {
@@ -43986,7 +43991,7 @@ Array [
 ]
 `;
 
-exports[`test text-block.pug 1`] = `
+exports[`text-block.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -44091,7 +44096,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text\'",
+    "val": "'text'",
   },
   Object {
     "loc": Object {
@@ -44108,7 +44113,7 @@ Array [
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
-    "val": "\'user[name]\'",
+    "val": "'user[name]'",
   },
   Object {
     "loc": Object {
@@ -44227,7 +44232,7 @@ Array [
     "mustEscape": true,
     "name": "type",
     "type": "attribute",
-    "val": "\'text\'",
+    "val": "'text'",
   },
   Object {
     "loc": Object {
@@ -44244,7 +44249,7 @@ Array [
     "mustEscape": true,
     "name": "name",
     "type": "attribute",
-    "val": "\'user[pass]\'",
+    "val": "'user[pass]'",
   },
   Object {
     "loc": Object {
@@ -44291,7 +44296,7 @@ Array [
 ]
 `;
 
-exports[`test utf8bom.pug 1`] = `
+exports[`utf8bom.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -44321,7 +44326,7 @@ Array [
       },
     },
     "type": "text",
-    "val": "\"foo\"",
+    "val": "\\"foo\\"",
   },
   Object {
     "loc": Object {
@@ -44354,7 +44359,7 @@ Array [
 ]
 `;
 
-exports[`test vars.pug 1`] = `
+exports[`vars.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -44371,7 +44376,7 @@ Array [
     },
     "mustEscape": false,
     "type": "code",
-    "val": "var foo = \'bar\'",
+    "val": "var foo = 'bar'",
   },
   Object {
     "loc": Object {
@@ -44512,7 +44517,7 @@ Array [
 ]
 `;
 
-exports[`test when-with-no-expression.pug 1`] = `
+exports[`when-with-no-expression.pug 1`] = `
 Object {
   "code": "PUG:NO_WHEN_EXPRESSION",
   "column": 5,
@@ -44521,7 +44526,7 @@ Object {
 }
 `;
 
-exports[`test while.pug 1`] = `
+exports[`while.pug 1`] = `
 Array [
   Object {
     "buffer": false,
@@ -44722,7 +44727,7 @@ Array [
 ]
 `;
 
-exports[`test while-with-no-expression.pug 1`] = `
+exports[`while-with-no-expression.pug 1`] = `
 Object {
   "code": "PUG:NO_WHILE_EXPRESSION",
   "column": 6,
@@ -44731,7 +44736,7 @@ Object {
 }
 `;
 
-exports[`test xml.pug 1`] = `
+exports[`xml.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -44806,7 +44811,7 @@ Array [
     "mustEscape": true,
     "name": "term",
     "type": "attribute",
-    "val": "\'some term\'",
+    "val": "'some term'",
   },
   Object {
     "loc": Object {
@@ -44897,7 +44902,7 @@ Array [
 ]
 `;
 
-exports[`test yield.pug 1`] = `
+exports[`yield.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -45047,7 +45052,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/caustic.js\'",
+    "val": "'/caustic.js'",
   },
   Object {
     "loc": Object {
@@ -45121,7 +45126,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/app.js\'",
+    "val": "'/app.js'",
   },
   Object {
     "loc": Object {
@@ -45196,7 +45201,7 @@ Array [
 ]
 `;
 
-exports[`test yield-before-conditional.pug 1`] = `
+exports[`yield-before-conditional.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -45346,7 +45351,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/caustic.js\'",
+    "val": "'/caustic.js'",
   },
   Object {
     "loc": Object {
@@ -45420,7 +45425,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/app.js\'",
+    "val": "'/app.js'",
   },
   Object {
     "loc": Object {
@@ -45495,7 +45500,7 @@ Array [
 ]
 `;
 
-exports[`test yield-before-conditional-head.pug 1`] = `
+exports[`yield-before-conditional-head.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -45571,7 +45576,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/jquery.js\'",
+    "val": "'/jquery.js'",
   },
   Object {
     "loc": Object {
@@ -45703,7 +45708,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/jquery.ui.js\'",
+    "val": "'/jquery.ui.js'",
   },
   Object {
     "loc": Object {
@@ -45764,7 +45769,7 @@ Array [
 ]
 `;
 
-exports[`test yield-head.pug 1`] = `
+exports[`yield-head.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -45840,7 +45845,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/jquery.js\'",
+    "val": "'/jquery.js'",
   },
   Object {
     "loc": Object {
@@ -45942,7 +45947,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/jquery.ui.js\'",
+    "val": "'/jquery.ui.js'",
   },
   Object {
     "loc": Object {
@@ -45989,7 +45994,7 @@ Array [
 ]
 `;
 
-exports[`test yield-title.pug 1`] = `
+exports[`yield-title.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -46169,7 +46174,7 @@ Array [
 ]
 `;
 
-exports[`test yield-title-head.pug 1`] = `
+exports[`yield-title-head.pug 1`] = `
 Array [
   Object {
     "loc": Object {
@@ -46303,7 +46308,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/jquery.js\'",
+    "val": "'/jquery.js'",
   },
   Object {
     "loc": Object {
@@ -46377,7 +46382,7 @@ Array [
     "mustEscape": true,
     "name": "src",
     "type": "attribute",
-    "val": "\'/jquery.ui.js\'",
+    "val": "'/jquery.ui.js'",
   },
   Object {
     "loc": Object {
diff --git a/packages/pug-linker/test/__snapshots__/index.test.js.snap b/packages/pug-linker/test/__snapshots__/index.test.js.snap
index 5e64d97e5..773c2d3d8 100644
--- a/packages/pug-linker/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-linker/test/__snapshots__/index.test.js.snap
@@ -1,3 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
 exports[`cases from pug include.script.input.json 1`] = `
 Object {
   "declaredBlocks": Object {},
@@ -10,12 +12,12 @@ Object {
         Object {
           "mustEscape": false,
           "name": "id",
-          "val": "\'pet-template\'",
+          "val": "'pet-template'",
         },
         Object {
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/x-template\'",
+          "val": "'text/x-template'",
         },
       ],
       "block": Object {
@@ -33,7 +35,7 @@ Object {
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'pet\'",
+                    "val": "'pet'",
                   },
                 ],
                 "block": Object {
@@ -201,7 +203,7 @@ Object {
                         Object {
                           "mustEscape": false,
                           "name": "id",
-                          "val": "\'content\'",
+                          "val": "'content'",
                         },
                       ],
                       "block": Object {
@@ -214,7 +216,7 @@ Object {
                               Object {
                                 "mustEscape": false,
                                 "name": "id",
-                                "val": "\'content-wrapper\'",
+                                "val": "'content-wrapper'",
                               },
                             ],
                             "block": Object {
@@ -307,7 +309,7 @@ Object {
                         Object {
                           "mustEscape": false,
                           "name": "id",
-                          "val": "\'footer\'",
+                          "val": "'footer'",
                         },
                       ],
                       "block": Object {
@@ -1078,7 +1080,7 @@ Object {
         Object {
           "mustEscape": true,
           "name": "type",
-          "val": "\"text/css\"",
+          "val": "\\"text/css\\"",
         },
       ],
       "block": Object {
@@ -1087,7 +1089,7 @@ Object {
         "nodes": Array [
           Object {
             "type": "Text",
-            "val": "@import \"some-included\"
+            "val": "@import \\"some-included\\"
 ",
           },
         ],
@@ -1141,7 +1143,7 @@ Object {
                             "filename": "include-only-text-body.pug",
                             "line": 1,
                             "type": "Text",
-                            "val": "The message is \"",
+                            "val": "The message is \\"",
                           },
                           Object {
                             "filename": "include-only-text-body.pug",
@@ -1184,7 +1186,7 @@ Object {
                             "filename": "include-only-text-body.pug",
                             "line": 3,
                             "type": "Text",
-                            "val": "\"",
+                            "val": "\\"",
                           },
                         ],
                         "type": "Block",
@@ -1234,7 +1236,7 @@ Object {
       "filename": "include-only-text-body.pug",
       "line": 1,
       "type": "Text",
-      "val": "The message is \"",
+      "val": "The message is \\"",
     },
     Object {
       "filename": "include-only-text-body.pug",
@@ -1245,7 +1247,7 @@ Object {
       "filename": "include-only-text-body.pug",
       "line": 3,
       "type": "Text",
-      "val": "\"",
+      "val": "\\"",
     },
   ],
   "type": "Block",
@@ -1283,7 +1285,7 @@ Object {
                         Object {
                           "mustEscape": true,
                           "name": "type",
-                          "val": "\'text/javascript\'",
+                          "val": "'text/javascript'",
                         },
                       ],
                       "block": Object {
@@ -1293,7 +1295,7 @@ Object {
                           Object {
                             "line": 3,
                             "type": "Text",
-                            "val": "alert(\'hello world\');",
+                            "val": "alert('hello world');",
                           },
                         ],
                         "type": "Block",
@@ -1316,7 +1318,7 @@ Object {
                             Object {
                               "mustEscape": true,
                               "name": "src",
-                              "val": "\'/caustic.js\'",
+                              "val": "'/caustic.js'",
                             },
                           ],
                           "block": Object {
@@ -1338,7 +1340,7 @@ Object {
                             Object {
                               "mustEscape": true,
                               "name": "src",
-                              "val": "\'/app.js\'",
+                              "val": "'/app.js'",
                             },
                           ],
                           "block": Object {
@@ -1404,7 +1406,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "type",
-                "val": "\'text/javascript\'",
+                "val": "'text/javascript'",
               },
             ],
             "block": Object {
@@ -1414,7 +1416,7 @@ Object {
                 Object {
                   "line": 3,
                   "type": "Text",
-                  "val": "alert(\'hello world\');",
+                  "val": "alert('hello world');",
                 },
               ],
               "type": "Block",
@@ -1520,7 +1522,7 @@ Object {
           Object {
             "type": "Text",
             "val": "<script>
-  console.log(\"foo\\nbar\")
+  console.log(\\"foo\\\\nbar\\")
 </script>
 ",
           },
@@ -1530,7 +1532,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "type",
-                "val": "\"text/javascript\"",
+                "val": "\\"text/javascript\\"",
               },
             ],
             "block": Object {
@@ -1540,11 +1542,11 @@ Object {
                 Object {
                   "type": "Text",
                   "val": "var STRING_SUBSTITUTIONS = {    // table of character substitutions
-  \'\\t\': \'\\\\t\',
-  \'\\r\': \'\\\\r\',
-  \'\\n\': \'\\\\n\',
-  \'\"\' : \'\\\\\"\',
-  \'\\\\\': \'\\\\\\\\\'
+  '\\\\t': '\\\\\\\\t',
+  '\\\\r': '\\\\\\\\r',
+  '\\\\n': '\\\\\\\\n',
+  '\\"' : '\\\\\\\\\\"',
+  '\\\\\\\\': '\\\\\\\\\\\\\\\\'
 };",
                 },
               ],
@@ -1594,7 +1596,7 @@ Object {
               "nodes": Array [
                 Object {
                   "type": "Text",
-                  "val": "var x = \"\\n here is some \\n new lined text\";
+                  "val": "var x = \\"\\\\n here is some \\\\n new lined text\\";
 ",
                 },
               ],
@@ -1648,7 +1650,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/jquery.js\'",
+                "val": "'vendor/jquery.js'",
               },
             ],
             "block": Object {
@@ -1670,7 +1672,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/caustic.js\'",
+                "val": "'vendor/caustic.js'",
               },
             ],
             "block": Object {
@@ -1692,7 +1694,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'app.js\'",
+                "val": "'app.js'",
               },
             ],
             "block": Object {
@@ -1714,7 +1716,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'foo.js\'",
+                "val": "'foo.js'",
               },
             ],
             "block": Object {
@@ -1736,7 +1738,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'bar.js\'",
+                "val": "'bar.js'",
               },
             ],
             "block": Object {
@@ -1780,7 +1782,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/jquery.js\'",
+                    "val": "'vendor/jquery.js'",
                   },
                 ],
                 "block": Object {
@@ -1802,7 +1804,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/caustic.js\'",
+                    "val": "'vendor/caustic.js'",
                   },
                 ],
                 "block": Object {
@@ -1824,7 +1826,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'app.js\'",
+                    "val": "'app.js'",
                   },
                 ],
                 "block": Object {
@@ -1846,7 +1848,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'foo.js\'",
+                    "val": "'foo.js'",
                   },
                 ],
                 "block": Object {
@@ -1868,7 +1870,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'bar.js\'",
+                    "val": "'bar.js'",
                   },
                 ],
                 "block": Object {
@@ -1953,7 +1955,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/jquery.js\'",
+                "val": "'vendor/jquery.js'",
               },
             ],
             "block": Object {
@@ -1975,7 +1977,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/caustic.js\'",
+                "val": "'vendor/caustic.js'",
               },
             ],
             "block": Object {
@@ -1997,7 +1999,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'app.js\'",
+                "val": "'app.js'",
               },
             ],
             "block": Object {
@@ -2019,7 +2021,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'foo.js\'",
+                "val": "'foo.js'",
               },
             ],
             "block": Object {
@@ -2041,7 +2043,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'bar.js\'",
+                "val": "'bar.js'",
               },
             ],
             "block": Object {
@@ -2085,7 +2087,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/jquery.js\'",
+                    "val": "'vendor/jquery.js'",
                   },
                 ],
                 "block": Object {
@@ -2107,7 +2109,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/caustic.js\'",
+                    "val": "'vendor/caustic.js'",
                   },
                 ],
                 "block": Object {
@@ -2129,7 +2131,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'app.js\'",
+                    "val": "'app.js'",
                   },
                 ],
                 "block": Object {
@@ -2151,7 +2153,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'foo.js\'",
+                    "val": "'foo.js'",
                   },
                 ],
                 "block": Object {
@@ -2173,7 +2175,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'bar.js\'",
+                    "val": "'bar.js'",
                   },
                 ],
                 "block": Object {
@@ -2248,12 +2250,12 @@ Object {
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'last\'",
+                "val": "'last'",
               },
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'prepend\'",
+                "val": "'prepend'",
               },
             ],
             "block": Object {
@@ -2282,12 +2284,12 @@ Object {
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'first\'",
+                "val": "'first'",
               },
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'prepend\'",
+                "val": "'prepend'",
               },
             ],
             "block": Object {
@@ -2316,7 +2318,7 @@ Object {
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'content\'",
+                "val": "'content'",
               },
             ],
             "block": Object {
@@ -2345,12 +2347,12 @@ Object {
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'first\'",
+                "val": "'first'",
               },
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'append\'",
+                "val": "'append'",
               },
             ],
             "block": Object {
@@ -2379,12 +2381,12 @@ Object {
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'last\'",
+                "val": "'last'",
               },
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'append\'",
+                "val": "'append'",
               },
             ],
             "block": Object {
@@ -2421,12 +2423,12 @@ Object {
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'last\'",
+                    "val": "'last'",
                   },
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'prepend\'",
+                    "val": "'prepend'",
                   },
                 ],
                 "block": Object {
@@ -2455,12 +2457,12 @@ Object {
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'first\'",
+                    "val": "'first'",
                   },
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'prepend\'",
+                    "val": "'prepend'",
                   },
                 ],
                 "block": Object {
@@ -2489,7 +2491,7 @@ Object {
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'content\'",
+                    "val": "'content'",
                   },
                 ],
                 "block": Object {
@@ -2518,12 +2520,12 @@ Object {
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'first\'",
+                    "val": "'first'",
                   },
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'append\'",
+                    "val": "'append'",
                   },
                 ],
                 "block": Object {
@@ -2552,12 +2554,12 @@ Object {
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'last\'",
+                    "val": "'last'",
                   },
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'append\'",
+                    "val": "'append'",
                   },
                 ],
                 "block": Object {
@@ -2600,7 +2602,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'foo.js\'",
+                "val": "'foo.js'",
               },
             ],
             "block": Object {
@@ -2622,7 +2624,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'/app.js\'",
+                "val": "'/app.js'",
               },
             ],
             "block": Object {
@@ -2644,7 +2646,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'jquery.js\'",
+                "val": "'jquery.js'",
               },
             ],
             "block": Object {
@@ -2681,12 +2683,12 @@ Object {
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'last\'",
+              "val": "'last'",
             },
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'prepend\'",
+              "val": "'prepend'",
             },
           ],
           "block": Object {
@@ -2715,12 +2717,12 @@ Object {
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'first\'",
+              "val": "'first'",
             },
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'prepend\'",
+              "val": "'prepend'",
             },
           ],
           "block": Object {
@@ -2749,7 +2751,7 @@ Object {
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'content\'",
+              "val": "'content'",
             },
           ],
           "block": Object {
@@ -2778,12 +2780,12 @@ Object {
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'first\'",
+              "val": "'first'",
             },
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'append\'",
+              "val": "'append'",
             },
           ],
           "block": Object {
@@ -2812,12 +2814,12 @@ Object {
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'last\'",
+              "val": "'last'",
             },
             Object {
               "mustEscape": false,
               "name": "class",
-              "val": "\'append\'",
+              "val": "'append'",
             },
           ],
           "block": Object {
@@ -2855,7 +2857,7 @@ Object {
             Object {
               "mustEscape": true,
               "name": "src",
-              "val": "\'foo.js\'",
+              "val": "'foo.js'",
             },
           ],
           "block": Object {
@@ -2877,7 +2879,7 @@ Object {
             Object {
               "mustEscape": true,
               "name": "src",
-              "val": "\'/app.js\'",
+              "val": "'/app.js'",
             },
           ],
           "block": Object {
@@ -2899,7 +2901,7 @@ Object {
             Object {
               "mustEscape": true,
               "name": "src",
-              "val": "\'jquery.js\'",
+              "val": "'jquery.js'",
             },
           ],
           "block": Object {
@@ -2949,7 +2951,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'foo.js\'",
+                "val": "'foo.js'",
               },
             ],
             "block": Object {
@@ -2971,7 +2973,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'bar.js\'",
+                "val": "'bar.js'",
               },
             ],
             "block": Object {
@@ -2993,7 +2995,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'app.js\'",
+                "val": "'app.js'",
               },
             ],
             "block": Object {
@@ -3015,7 +3017,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/jquery.js\'",
+                "val": "'vendor/jquery.js'",
               },
             ],
             "block": Object {
@@ -3037,7 +3039,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/caustic.js\'",
+                "val": "'vendor/caustic.js'",
               },
             ],
             "block": Object {
@@ -3081,7 +3083,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'foo.js\'",
+                    "val": "'foo.js'",
                   },
                 ],
                 "block": Object {
@@ -3103,7 +3105,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'bar.js\'",
+                    "val": "'bar.js'",
                   },
                 ],
                 "block": Object {
@@ -3125,7 +3127,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'app.js\'",
+                    "val": "'app.js'",
                   },
                 ],
                 "block": Object {
@@ -3147,7 +3149,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/jquery.js\'",
+                    "val": "'vendor/jquery.js'",
                   },
                 ],
                 "block": Object {
@@ -3169,7 +3171,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/caustic.js\'",
+                    "val": "'vendor/caustic.js'",
                   },
                 ],
                 "block": Object {
@@ -3254,7 +3256,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'foo.js\'",
+                "val": "'foo.js'",
               },
             ],
             "block": Object {
@@ -3276,7 +3278,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'bar.js\'",
+                "val": "'bar.js'",
               },
             ],
             "block": Object {
@@ -3298,7 +3300,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'app.js\'",
+                "val": "'app.js'",
               },
             ],
             "block": Object {
@@ -3320,7 +3322,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/jquery.js\'",
+                "val": "'vendor/jquery.js'",
               },
             ],
             "block": Object {
@@ -3342,7 +3344,7 @@ Object {
               Object {
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'vendor/caustic.js\'",
+                "val": "'vendor/caustic.js'",
               },
             ],
             "block": Object {
@@ -3386,7 +3388,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'foo.js\'",
+                    "val": "'foo.js'",
                   },
                 ],
                 "block": Object {
@@ -3408,7 +3410,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'bar.js\'",
+                    "val": "'bar.js'",
                   },
                 ],
                 "block": Object {
@@ -3430,7 +3432,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'app.js\'",
+                    "val": "'app.js'",
                   },
                 ],
                 "block": Object {
@@ -3452,7 +3454,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/jquery.js\'",
+                    "val": "'vendor/jquery.js'",
                   },
                 ],
                 "block": Object {
@@ -3474,7 +3476,7 @@ Object {
                   Object {
                     "mustEscape": true,
                     "name": "src",
-                    "val": "\'vendor/caustic.js\'",
+                    "val": "'vendor/caustic.js'",
                   },
                 ],
                 "block": Object {
@@ -3545,7 +3547,7 @@ exports[`error handling extends-not-first.input.json 1`] = `
 Object {
   "code": "PUG:EXTENDS_NOT_FIRST",
   "line": 4,
-  "msg": "Declaration of template inheritance (\"extends\") should be the first thing in the file. There can only be one extends statement per file.",
+  "msg": "Declaration of template inheritance (\\"extends\\") should be the first thing in the file. There can only be one extends statement per file.",
 }
 `;
 
@@ -3579,18 +3581,18 @@ Object {
         "name": "body",
         "nodes": Array [
           Object {
-            "args": "\'myimg.png\'",
+            "args": "'myimg.png'",
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'with-border\'",
+                "val": "'with-border'",
               },
               Object {
                 "mustEscape": true,
                 "name": "alt",
-                "val": "\"My image\"",
+                "val": "\\"My image\\"",
               },
             ],
             "block": null,
@@ -3609,18 +3611,18 @@ Object {
             "name": "body",
             "nodes": Array [
               Object {
-                "args": "\'myimg.png\'",
+                "args": "'myimg.png'",
                 "attributeBlocks": Array [],
                 "attrs": Array [
                   Object {
                     "mustEscape": false,
                     "name": "class",
-                    "val": "\'with-border\'",
+                    "val": "'with-border'",
                   },
                   Object {
                     "mustEscape": true,
                     "name": "alt",
-                    "val": "\"My image\"",
+                    "val": "\\"My image\\"",
                   },
                 ],
                 "block": null,
@@ -3759,18 +3761,18 @@ Object {
                   "name": "body",
                   "nodes": Array [
                     Object {
-                      "args": "\'myimg.png\'",
+                      "args": "'myimg.png'",
                       "attributeBlocks": Array [],
                       "attrs": Array [
                         Object {
                           "mustEscape": false,
                           "name": "class",
-                          "val": "\'with-border\'",
+                          "val": "'with-border'",
                         },
                         Object {
                           "mustEscape": true,
                           "name": "alt",
-                          "val": "\"My image\"",
+                          "val": "\\"My image\\"",
                         },
                       ],
                       "block": null,
diff --git a/packages/pug-load/test/__snapshots__/index.test.js.snap b/packages/pug-load/test/__snapshots__/index.test.js.snap
index f7168dcbc..1fd0b4beb 100644
--- a/packages/pug-load/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-load/test/__snapshots__/index.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test pug-load 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`pug-load 1`] = `
 Object {
   "filename": "<dirname>/foo.pug",
   "line": 0,
@@ -64,7 +66,7 @@ Object {
                       "line": 1,
                       "mustEscape": false,
                       "name": "class",
-                      "val": "\'bing\'",
+                      "val": "'bing'",
                     },
                   ],
                   "block": Object {
@@ -120,7 +122,7 @@ Object {
                   "fullPath": "<dirname>/script.js",
                   "line": 6,
                   "path": "script.js",
-                  "str": "document.write(\'hello world!\');
+                  "str": "document.write('hello world!');
 ",
                   "type": "FileReference",
                 },
diff --git a/packages/pug-parser/test/__snapshots__/index.test.js.snap b/packages/pug-parser/test/__snapshots__/index.test.js.snap
index 54a141c98..39ab5cbc3 100644
--- a/packages/pug-parser/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/index.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test attr-es2015.tokens.json 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`attr-es2015.tokens.json 1`] = `
 Object {
   "filename": "attr-es2015.tokens.json",
   "line": 0,
@@ -11,7 +13,7 @@ Object {
       "line": 1,
       "mustEscape": false,
       "type": "Code",
-      "val": "var avatar = \'219b77f9d21de75e81851b6b886057c7\'",
+      "val": "var avatar = '219b77f9d21de75e81851b6b886057c7'",
     },
     Object {
       "attributeBlocks": Array [],
@@ -22,7 +24,7 @@ Object {
           "line": 3,
           "mustEscape": false,
           "name": "class",
-          "val": "\'avatar-div\'",
+          "val": "'avatar-div'",
         },
         Object {
           "column": 16,
@@ -52,7 +54,7 @@ Object {
 }
 `;
 
-exports[`test attrs.js.tokens.json 1`] = `
+exports[`attrs.js.tokens.json 1`] = `
 Object {
   "filename": "attrs.js.tokens.json",
   "line": 0,
@@ -75,7 +77,10 @@ Object {
       "line": 2,
       "mustEscape": false,
       "type": "Code",
-      "val": "function answer() { return 42; }",
+      "val": "function answer() {
+  return 42;
+}
+",
     },
     Object {
       "attributeBlocks": Array [],
@@ -86,7 +91,7 @@ Object {
           "line": 3,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/user/\' + id",
+          "val": "'/user/' + id",
         },
         Object {
           "column": 23,
@@ -94,7 +99,7 @@ Object {
           "line": 3,
           "mustEscape": true,
           "name": "class",
-          "val": "\'button\'",
+          "val": "'button'",
         },
       ],
       "block": Object {
@@ -120,7 +125,7 @@ Object {
           "line": 4,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/user/\' + id",
+          "val": "'/user/' + id",
         },
         Object {
           "column": 27,
@@ -128,7 +133,7 @@ Object {
           "line": 4,
           "mustEscape": true,
           "name": "class",
-          "val": "\'button\'",
+          "val": "'button'",
         },
       ],
       "block": Object {
@@ -154,7 +159,7 @@ Object {
           "line": 5,
           "mustEscape": true,
           "name": "key",
-          "val": "\'answer\'",
+          "val": "'answer'",
         },
         Object {
           "column": 20,
@@ -188,7 +193,7 @@ Object {
           "line": 6,
           "mustEscape": true,
           "name": "class",
-          "val": "[\'class1\', \'class2\']",
+          "val": "['class1', 'class2']",
         },
       ],
       "block": Object {
@@ -214,7 +219,7 @@ Object {
           "line": 7,
           "mustEscape": false,
           "name": "class",
-          "val": "\'tag-class\'",
+          "val": "'tag-class'",
         },
         Object {
           "column": 13,
@@ -222,7 +227,7 @@ Object {
           "line": 7,
           "mustEscape": true,
           "name": "class",
-          "val": "[\'class1\', \'class2\']",
+          "val": "['class1', 'class2']",
         },
       ],
       "block": Object {
@@ -248,7 +253,7 @@ Object {
           "line": 9,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/user/\' + id",
+          "val": "'/user/' + id",
         },
         Object {
           "column": 22,
@@ -256,7 +261,7 @@ Object {
           "line": 9,
           "mustEscape": true,
           "name": "class",
-          "val": "\'button\'",
+          "val": "'button'",
         },
       ],
       "block": Object {
@@ -282,7 +287,7 @@ Object {
           "line": 10,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/user/\' + id",
+          "val": "'/user/' + id",
         },
         Object {
           "column": 26,
@@ -290,7 +295,7 @@ Object {
           "line": 10,
           "mustEscape": true,
           "name": "class",
-          "val": "\'button\'",
+          "val": "'button'",
         },
       ],
       "block": Object {
@@ -316,7 +321,7 @@ Object {
           "line": 11,
           "mustEscape": true,
           "name": "key",
-          "val": "\'answer\'",
+          "val": "'answer'",
         },
         Object {
           "column": 19,
@@ -350,7 +355,7 @@ Object {
           "line": 12,
           "mustEscape": true,
           "name": "class",
-          "val": "[\'class1\', \'class2\']",
+          "val": "['class1', 'class2']",
         },
       ],
       "block": Object {
@@ -376,7 +381,7 @@ Object {
           "line": 13,
           "mustEscape": false,
           "name": "class",
-          "val": "\'tag-class\'",
+          "val": "'tag-class'",
         },
         Object {
           "column": 13,
@@ -384,7 +389,7 @@ Object {
           "line": 13,
           "mustEscape": true,
           "name": "class",
-          "val": "[\'class1\', \'class2\']",
+          "val": "['class1', 'class2']",
         },
       ],
       "block": Object {
@@ -408,7 +413,7 @@ Object {
           "filename": "attrs.js.tokens.json",
           "line": 15,
           "type": "AttributeBlock",
-          "val": "{foo: \'bar\'}",
+          "val": "{foo: 'bar'}",
         },
       ],
       "attrs": Array [
@@ -452,7 +457,7 @@ Object {
           "filename": "attrs.js.tokens.json",
           "line": 17,
           "type": "AttributeBlock",
-          "val": "{baz: \'baz\'}",
+          "val": "{baz: 'baz'}",
         },
       ],
       "attrs": Array [
@@ -492,7 +497,7 @@ Object {
 }
 `;
 
-exports[`test attrs.tokens.json 1`] = `
+exports[`attrs.tokens.json 1`] = `
 Object {
   "filename": "attrs.tokens.json",
   "line": 0,
@@ -506,7 +511,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/contact\'",
+          "val": "'/contact'",
         },
       ],
       "block": Object {
@@ -540,7 +545,7 @@ Object {
           "line": 2,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/save\'",
+          "val": "'/save'",
         },
         Object {
           "column": 16,
@@ -548,7 +553,7 @@ Object {
           "line": 2,
           "mustEscape": false,
           "name": "class",
-          "val": "\'button\'",
+          "val": "'button'",
         },
       ],
       "block": Object {
@@ -624,7 +629,7 @@ Object {
           "line": 4,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'foo, bar, baz\'",
+          "val": "'foo, bar, baz'",
         },
         Object {
           "column": 24,
@@ -658,7 +663,7 @@ Object {
           "line": 5,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'((foo))\'",
+          "val": "'((foo))'",
         },
         Object {
           "column": 18,
@@ -699,7 +704,7 @@ Object {
                 "line": 7,
                 "mustEscape": true,
                 "name": "value",
-                "val": "\'foo\'",
+                "val": "'foo'",
               },
               Object {
                 "column": 23,
@@ -749,7 +754,7 @@ Object {
                 "line": 8,
                 "mustEscape": true,
                 "name": "value",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -794,7 +799,7 @@ Object {
           "line": 9,
           "mustEscape": true,
           "name": "foo",
-          "val": "\"class:\"",
+          "val": "\\"class:\\"",
         },
       ],
       "block": Object {
@@ -820,7 +825,7 @@ Object {
           "line": 10,
           "mustEscape": true,
           "name": "pattern",
-          "val": "\'\\\\S+\'",
+          "val": "'\\\\\\\\S+'",
         },
       ],
       "block": Object {
@@ -846,7 +851,7 @@ Object {
           "line": 12,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/contact\'",
+          "val": "'/contact'",
         },
       ],
       "block": Object {
@@ -880,7 +885,7 @@ Object {
           "line": 13,
           "mustEscape": true,
           "name": "href",
-          "val": "\'/save\'",
+          "val": "'/save'",
         },
         Object {
           "column": 16,
@@ -888,7 +893,7 @@ Object {
           "line": 13,
           "mustEscape": false,
           "name": "class",
-          "val": "\'button\'",
+          "val": "'button'",
         },
       ],
       "block": Object {
@@ -964,7 +969,7 @@ Object {
           "line": 15,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'foo, bar, baz\'",
+          "val": "'foo, bar, baz'",
         },
         Object {
           "column": 23,
@@ -998,7 +1003,7 @@ Object {
           "line": 16,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'((foo))\'",
+          "val": "'((foo))'",
         },
         Object {
           "column": 17,
@@ -1039,7 +1044,7 @@ Object {
                 "line": 18,
                 "mustEscape": true,
                 "name": "value",
-                "val": "\'foo\'",
+                "val": "'foo'",
               },
               Object {
                 "column": 22,
@@ -1089,7 +1094,7 @@ Object {
                 "line": 19,
                 "mustEscape": true,
                 "name": "value",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -1134,7 +1139,7 @@ Object {
           "line": 20,
           "mustEscape": true,
           "name": "foo",
-          "val": "\"class:\"",
+          "val": "\\"class:\\"",
         },
       ],
       "block": Object {
@@ -1160,7 +1165,7 @@ Object {
           "line": 21,
           "mustEscape": true,
           "name": "pattern",
-          "val": "\'\\\\S+\'",
+          "val": "'\\\\\\\\S+'",
         },
       ],
       "block": Object {
@@ -1186,7 +1191,7 @@ Object {
           "line": 22,
           "mustEscape": true,
           "name": "terse",
-          "val": "\"true\"",
+          "val": "\\"true\\"",
         },
       ],
       "block": Object {
@@ -1441,7 +1446,7 @@ Object {
       "line": 38,
       "mustEscape": false,
       "type": "Code",
-      "val": "var attrs = {foo: \'bar\', bar: \'<baz>\'}",
+      "val": "var attrs = {foo: 'bar', bar: '<baz>'}",
     },
     Object {
       "attributeBlocks": Array [
@@ -1477,7 +1482,7 @@ Object {
           "line": 42,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'foo\'",
+          "val": "'foo'",
         },
         Object {
           "column": 13,
@@ -1485,7 +1490,7 @@ Object {
           "line": 42,
           "mustEscape": true,
           "name": "bar",
-          "val": "\"bar\"",
+          "val": "\\"bar\\"",
         },
       ],
       "block": Object {
@@ -1511,7 +1516,7 @@ Object {
           "line": 43,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'foo\'",
+          "val": "'foo'",
         },
         Object {
           "column": 13,
@@ -1519,7 +1524,7 @@ Object {
           "line": 43,
           "mustEscape": true,
           "name": "bar",
-          "val": "\'bar\'",
+          "val": "'bar'",
         },
       ],
       "block": Object {
@@ -1541,7 +1546,7 @@ Object {
 }
 `;
 
-exports[`test attrs.unescaped.tokens.json 1`] = `
+exports[`attrs.unescaped.tokens.json 1`] = `
 Object {
   "filename": "attrs.unescaped.tokens.json",
   "line": 0,
@@ -1555,7 +1560,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/x-template\'",
+          "val": "'text/x-template'",
         },
       ],
       "block": Object {
@@ -1571,7 +1576,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'user-<%= user.id %>\'",
+                "val": "'user-<%= user.id %>'",
               },
             ],
             "block": Object {
@@ -1630,7 +1635,7 @@ Object {
 }
 `;
 
-exports[`test attrs-data.tokens.json 1`] = `
+exports[`attrs-data.tokens.json 1`] = `
 Object {
   "filename": "attrs-data.tokens.json",
   "line": 0,
@@ -1643,7 +1648,7 @@ Object {
       "line": 1,
       "mustEscape": false,
       "type": "Code",
-      "val": "var user = { name: \'tobi\' }",
+      "val": "var user = { name: 'tobi' }",
     },
     Object {
       "attributeBlocks": Array [],
@@ -1706,7 +1711,7 @@ Object {
           "line": 4,
           "mustEscape": true,
           "name": "data-username",
-          "val": "\'tobi\'",
+          "val": "'tobi'",
         },
       ],
       "block": Object {
@@ -1732,7 +1737,7 @@ Object {
           "line": 5,
           "mustEscape": true,
           "name": "data-escaped",
-          "val": "{message: \"Let\'s rock!\"}",
+          "val": "{message: \\"Let's rock!\\"}",
         },
       ],
       "block": Object {
@@ -1758,7 +1763,7 @@ Object {
           "line": 6,
           "mustEscape": true,
           "name": "data-ampersand",
-          "val": "{message: \"a quote: &quot; this & that\"}",
+          "val": "{message: \\"a quote: &quot; this & that\\"}",
         },
       ],
       "block": Object {
@@ -1806,7 +1811,7 @@ Object {
 }
 `;
 
-exports[`test basic.tokens.json 1`] = `
+exports[`basic.tokens.json 1`] = `
 Object {
   "filename": "basic.tokens.json",
   "line": 0,
@@ -1877,7 +1882,7 @@ Object {
 }
 `;
 
-exports[`test blanks.tokens.json 1`] = `
+exports[`blanks.tokens.json 1`] = `
 Object {
   "filename": "blanks.tokens.json",
   "line": 0,
@@ -1980,7 +1985,7 @@ Object {
 }
 `;
 
-exports[`test block-code.tokens.json 1`] = `
+exports[`block-code.tokens.json 1`] = `
 Object {
   "filename": "block-code.tokens.json",
   "line": 0,
@@ -1993,8 +1998,8 @@ Object {
       "line": 1,
       "mustEscape": false,
       "type": "Code",
-      "val": "list = [\"uno\", \"dos\", \"tres\",
-        \"cuatro\", \"cinco\", \"seis\"];",
+      "val": "list = [\\"uno\\", \\"dos\\", \\"tres\\",
+        \\"cuatro\\", \\"cinco\\", \\"seis\\"];",
     },
     Object {
       "buffer": false,
@@ -2076,7 +2081,7 @@ item.slice(1);",
 }
 `;
 
-exports[`test block-expansion.shorthands.tokens.json 1`] = `
+exports[`block-expansion.shorthands.tokens.json 1`] = `
 Object {
   "filename": "block-expansion.shorthands.tokens.json",
   "line": 0,
@@ -2097,7 +2102,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'list-item\'",
+                "val": "'list-item'",
               },
             ],
             "block": Object {
@@ -2113,7 +2118,7 @@ Object {
                       "line": 2,
                       "mustEscape": false,
                       "name": "class",
-                      "val": "\'foo\'",
+                      "val": "'foo'",
                     },
                   ],
                   "block": Object {
@@ -2129,7 +2134,7 @@ Object {
                             "line": 2,
                             "mustEscape": false,
                             "name": "id",
-                            "val": "\'bar\'",
+                            "val": "'bar'",
                           },
                         ],
                         "block": Object {
@@ -2192,7 +2197,7 @@ Object {
 }
 `;
 
-exports[`test block-expansion.tokens.json 1`] = `
+exports[`block-expansion.tokens.json 1`] = `
 Object {
   "filename": "block-expansion.tokens.json",
   "line": 0,
@@ -2220,7 +2225,7 @@ Object {
                       "line": 2,
                       "mustEscape": true,
                       "name": "href",
-                      "val": "\'#\'",
+                      "val": "'#'",
                     },
                   ],
                   "block": Object {
@@ -2272,7 +2277,7 @@ Object {
                       "line": 3,
                       "mustEscape": true,
                       "name": "href",
-                      "val": "\'#\'",
+                      "val": "'#'",
                     },
                   ],
                   "block": Object {
@@ -2349,7 +2354,7 @@ Object {
 }
 `;
 
-exports[`test blockquote.tokens.json 1`] = `
+exports[`blockquote.tokens.json 1`] = `
 Object {
   "filename": "blockquote.tokens.json",
   "line": 0,
@@ -2427,7 +2432,7 @@ Object {
 }
 `;
 
-exports[`test blocks-in-blocks.tokens.json 1`] = `
+exports[`blocks-in-blocks.tokens.json 1`] = `
 Object {
   "filename": "blocks-in-blocks.tokens.json",
   "line": 0,
@@ -2485,7 +2490,7 @@ Object {
 }
 `;
 
-exports[`test blocks-in-if.tokens.json 1`] = `
+exports[`blocks-in-if.tokens.json 1`] = `
 Object {
   "filename": "blocks-in-if.tokens.json",
   "line": 0,
@@ -2611,7 +2616,7 @@ Object {
                             "line": 15,
                             "mustEscape": true,
                             "name": "charset",
-                            "val": "\'utf8\'",
+                            "val": "'utf8'",
                           },
                         ],
                         "block": Object {
@@ -2746,7 +2751,7 @@ Object {
 }
 `;
 
-exports[`test case.tokens.json 1`] = `
+exports[`case.tokens.json 1`] = `
 Object {
   "filename": "case.tokens.json",
   "line": 0,
@@ -3063,7 +3068,7 @@ Object {
                   "line": 16,
                   "mustEscape": false,
                   "type": "Code",
-                  "val": "var friend = \'Tim:G\'",
+                  "val": "var friend = 'Tim:G'",
                 },
                 Object {
                   "block": Object {
@@ -3105,7 +3110,7 @@ Object {
                         },
                         "column": 7,
                         "debug": false,
-                        "expr": "\'Tim:G\'",
+                        "expr": "'Tim:G'",
                         "filename": "case.tokens.json",
                         "line": 18,
                         "type": "When",
@@ -3145,7 +3150,7 @@ Object {
                         },
                         "column": 7,
                         "debug": false,
-                        "expr": "{tim: \'g\'}",
+                        "expr": "{tim: 'g'}",
                         "filename": "case.tokens.json",
                         "line": 19,
                         "type": "When",
@@ -3186,7 +3191,7 @@ Object {
 }
 `;
 
-exports[`test case-blocks.tokens.json 1`] = `
+exports[`case-blocks.tokens.json 1`] = `
 Object {
   "filename": "case-blocks.tokens.json",
   "line": 0,
@@ -3393,7 +3398,7 @@ Object {
 }
 `;
 
-exports[`test classes.tokens.json 1`] = `
+exports[`classes.tokens.json 1`] = `
 Object {
   "filename": "classes.tokens.json",
   "line": 0,
@@ -3407,7 +3412,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "class",
-          "val": "[\'foo\', \'bar\', \'baz\']",
+          "val": "['foo', 'bar', 'baz']",
         },
       ],
       "block": Object {
@@ -3433,7 +3438,7 @@ Object {
           "line": 5,
           "mustEscape": false,
           "name": "class",
-          "val": "\'foo\'",
+          "val": "'foo'",
         },
         Object {
           "column": 7,
@@ -3441,7 +3446,7 @@ Object {
           "line": 5,
           "mustEscape": true,
           "name": "class",
-          "val": "\'bar\'",
+          "val": "'bar'",
         },
         Object {
           "column": 19,
@@ -3449,7 +3454,7 @@ Object {
           "line": 5,
           "mustEscape": false,
           "name": "class",
-          "val": "\'baz\'",
+          "val": "'baz'",
         },
       ],
       "block": Object {
@@ -3475,7 +3480,7 @@ Object {
           "line": 9,
           "mustEscape": false,
           "name": "class",
-          "val": "\'foo-bar_baz\'",
+          "val": "'foo-bar_baz'",
         },
       ],
       "block": Object {
@@ -3527,7 +3532,7 @@ Object {
           "line": 13,
           "mustEscape": false,
           "name": "class",
-          "val": "\'-foo\'",
+          "val": "'-foo'",
         },
       ],
       "block": Object {
@@ -3553,7 +3558,7 @@ Object {
           "line": 14,
           "mustEscape": false,
           "name": "class",
-          "val": "\'3foo\'",
+          "val": "'3foo'",
         },
       ],
       "block": Object {
@@ -3575,7 +3580,7 @@ Object {
 }
 `;
 
-exports[`test classes-empty.tokens.json 1`] = `
+exports[`classes-empty.tokens.json 1`] = `
 Object {
   "filename": "classes-empty.tokens.json",
   "line": 0,
@@ -3589,7 +3594,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "class",
-          "val": "\'\'",
+          "val": "''",
         },
       ],
       "block": Object {
@@ -3663,7 +3668,7 @@ Object {
 }
 `;
 
-exports[`test code.conditionals.tokens.json 1`] = `
+exports[`code.conditionals.tokens.json 1`] = `
 Object {
   "filename": "code.conditionals.tokens.json",
   "line": 0,
@@ -4083,7 +4088,7 @@ Object {
             },
             "filename": "code.conditionals.tokens.json",
             "line": 26,
-            "test": "\'works\'",
+            "test": "'works'",
             "type": "Conditional",
           },
         ],
@@ -4091,7 +4096,7 @@ Object {
       },
       "filename": "code.conditionals.tokens.json",
       "line": 25,
-      "test": "\'nested\'",
+      "test": "'nested'",
       "type": "Conditional",
     },
     Object {
@@ -4116,7 +4121,7 @@ Object {
                 "line": 32,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -4164,7 +4169,7 @@ Object {
                 "line": 34,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -4198,7 +4203,7 @@ Object {
           "line": 36,
           "mustEscape": false,
           "name": "class",
-          "val": "\'bing\'",
+          "val": "'bing'",
         },
       ],
       "block": Object {
@@ -4230,7 +4235,7 @@ Object {
                   "line": 43,
                   "mustEscape": false,
                   "name": "class",
-                  "val": "\'foo\'",
+                  "val": "'foo'",
                 },
               ],
               "block": Object {
@@ -4264,7 +4269,7 @@ Object {
                   "line": 41,
                   "mustEscape": false,
                   "name": "class",
-                  "val": "\'bar\'",
+                  "val": "'bar'",
                 },
               ],
               "block": Object {
@@ -4303,7 +4308,7 @@ Object {
                 "line": 39,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'bing\'",
+                "val": "'bing'",
               },
             ],
             "block": Object {
@@ -4333,7 +4338,7 @@ Object {
 }
 `;
 
-exports[`test code.escape.tokens.json 1`] = `
+exports[`code.escape.tokens.json 1`] = `
 Object {
   "filename": "code.escape.tokens.json",
   "line": 0,
@@ -4353,7 +4358,7 @@ Object {
             "line": 1,
             "mustEscape": true,
             "type": "Code",
-            "val": "\'<script>\'",
+            "val": "'<script>'",
           },
         ],
         "type": "Block",
@@ -4381,7 +4386,7 @@ Object {
             "line": 2,
             "mustEscape": false,
             "type": "Code",
-            "val": "\'<script>\'",
+            "val": "'<script>'",
           },
         ],
         "type": "Block",
@@ -4399,7 +4404,7 @@ Object {
 }
 `;
 
-exports[`test code.iteration.tokens.json 1`] = `
+exports[`code.iteration.tokens.json 1`] = `
 Object {
   "filename": "code.iteration.tokens.json",
   "line": 0,
@@ -4518,7 +4523,7 @@ Object {
                       "line": 13,
                       "mustEscape": true,
                       "name": "class",
-                      "val": "\'item-\' + i",
+                      "val": "'item-' + i",
                     },
                   ],
                   "block": Object {
@@ -4710,7 +4715,7 @@ Object {
       "line": 24,
       "mustEscape": false,
       "type": "Code",
-      "val": "var letters = [\'a\', \'b\', \'c\']",
+      "val": "var letters = ['a', 'b', 'c']",
     },
     Object {
       "attributeBlocks": Array [],
@@ -4894,7 +4899,7 @@ Object {
 }
 `;
 
-exports[`test code.tokens.json 1`] = `
+exports[`code.tokens.json 1`] = `
 Object {
   "filename": "code.tokens.json",
   "line": 0,
@@ -4970,7 +4975,7 @@ Object {
             "line": 3,
             "mustEscape": true,
             "type": "Code",
-            "val": "\'\'",
+            "val": "''",
           },
         ],
         "type": "Block",
@@ -5100,7 +5105,7 @@ Object {
           "line": 8,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'\'",
+          "val": "''",
         },
       ],
       "block": Object {
@@ -5174,7 +5179,7 @@ Object {
 }
 `;
 
-exports[`test comments.source.tokens.json 1`] = `
+exports[`comments.source.tokens.json 1`] = `
 Object {
   "filename": "comments.source.tokens.json",
   "line": 0,
@@ -5281,7 +5286,7 @@ Object {
 }
 `;
 
-exports[`test comments.tokens.json 1`] = `
+exports[`comments.tokens.json 1`] = `
 Object {
   "filename": "comments.tokens.json",
   "line": 0,
@@ -5574,7 +5579,7 @@ Object {
             "filename": "comments.tokens.json",
             "line": 24,
             "type": "Text",
-            "val": "script(src=\'/lame.js\')",
+            "val": "script(src='/lame.js')",
           },
           Object {
             "column": 1,
@@ -5650,7 +5655,7 @@ Object {
           "line": 29,
           "mustEscape": false,
           "name": "class",
-          "val": "\'foo\'",
+          "val": "'foo'",
         },
       ],
       "block": Object {
@@ -5680,7 +5685,7 @@ Object {
 }
 `;
 
-exports[`test comments-in-case.tokens.json 1`] = `
+exports[`comments-in-case.tokens.json 1`] = `
 Object {
   "filename": "comments-in-case.tokens.json",
   "line": 0,
@@ -5714,7 +5719,7 @@ Object {
                   "line": 4,
                   "mustEscape": false,
                   "type": "Code",
-                  "val": "var s = \'this\'",
+                  "val": "var s = 'this'",
                 },
                 Object {
                   "block": Object {
@@ -5738,7 +5743,7 @@ Object {
                                     "filename": "comments-in-case.tokens.json",
                                     "line": 8,
                                     "type": "Text",
-                                    "val": "It\'s this!",
+                                    "val": "It's this!",
                                   },
                                 ],
                                 "type": "Block",
@@ -5756,7 +5761,7 @@ Object {
                         },
                         "column": 6,
                         "debug": false,
-                        "expr": "\'this\'",
+                        "expr": "'this'",
                         "filename": "comments-in-case.tokens.json",
                         "line": 7,
                         "type": "When",
@@ -5778,7 +5783,7 @@ Object {
                                     "filename": "comments-in-case.tokens.json",
                                     "line": 10,
                                     "type": "Text",
-                                    "val": "It\'s that!",
+                                    "val": "It's that!",
                                   },
                                 ],
                                 "type": "Block",
@@ -5796,7 +5801,7 @@ Object {
                         },
                         "column": 6,
                         "debug": false,
-                        "expr": "\'that\'",
+                        "expr": "'that'",
                         "filename": "comments-in-case.tokens.json",
                         "line": 9,
                         "type": "When",
@@ -5837,7 +5842,7 @@ Object {
 }
 `;
 
-exports[`test doctype.custom.tokens.json 1`] = `
+exports[`doctype.custom.tokens.json 1`] = `
 Object {
   "filename": "doctype.custom.tokens.json",
   "line": 0,
@@ -5854,7 +5859,7 @@ Object {
 }
 `;
 
-exports[`test doctype.default.tokens.json 1`] = `
+exports[`doctype.default.tokens.json 1`] = `
 Object {
   "filename": "doctype.default.tokens.json",
   "line": 0,
@@ -5932,7 +5937,7 @@ Object {
 }
 `;
 
-exports[`test doctype.keyword.tokens.json 1`] = `
+exports[`doctype.keyword.tokens.json 1`] = `
 Object {
   "filename": "doctype.keyword.tokens.json",
   "line": 0,
@@ -5949,7 +5954,7 @@ Object {
 }
 `;
 
-exports[`test each.else.tokens.json 1`] = `
+exports[`each.else.tokens.json 1`] = `
 Object {
   "filename": "each.else.tokens.json",
   "line": 0,
@@ -6066,7 +6071,7 @@ Object {
       "line": 11,
       "mustEscape": false,
       "type": "Code",
-      "val": "var users = [{ name: \'tobi\', friends: [\'loki\'] }, { name: \'loki\' }]",
+      "val": "var users = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]",
     },
     Object {
       "alternate": null,
@@ -6185,7 +6190,7 @@ Object {
       "line": 20,
       "mustEscape": false,
       "type": "Code",
-      "val": "var user = { name: \'tobi\', age: 10 }",
+      "val": "var user = { name: 'tobi', age: 10 }",
     },
     Object {
       "attributeBlocks": Array [],
@@ -6437,7 +6442,7 @@ Object {
       "line": 37,
       "mustEscape": false,
       "type": "Code",
-      "val": "user.name = \'tobi\'",
+      "val": "user.name = 'tobi'",
     },
     Object {
       "attributeBlocks": Array [],
@@ -6555,7 +6560,7 @@ Object {
 }
 `;
 
-exports[`test escape-chars.tokens.json 1`] = `
+exports[`escape-chars.tokens.json 1`] = `
 Object {
   "filename": "escape-chars.tokens.json",
   "line": 0,
@@ -6572,7 +6577,7 @@ Object {
             "filename": "escape-chars.tokens.json",
             "line": 2,
             "type": "Text",
-            "val": "var re = /\\d+/;",
+            "val": "var re = /\\\\d+/;",
           },
         ],
         "type": "Block",
@@ -6591,7 +6596,7 @@ Object {
 }
 `;
 
-exports[`test escape-test.tokens.json 1`] = `
+exports[`escape-test.tokens.json 1`] = `
 Object {
   "filename": "escape-test.tokens.json",
   "line": 0,
@@ -6675,7 +6680,7 @@ Object {
                         "line": 7,
                         "mustEscape": false,
                         "type": "Code",
-                        "val": "var txt = \'<param name=\"flashvars\" value=\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\"/>\'",
+                        "val": "var txt = '<param name=\\"flashvars\\" value=\\"a=&quot;value_a&quot;&b=&quot;value_b&quot;&c=3\\"/>'",
                       },
                       Object {
                         "buffer": true,
@@ -6725,7 +6730,7 @@ Object {
 }
 `;
 
-exports[`test escaping-class-attribute.tokens.json 1`] = `
+exports[`escaping-class-attribute.tokens.json 1`] = `
 Object {
   "filename": "escaping-class-attribute.tokens.json",
   "line": 0,
@@ -6739,7 +6744,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "attr",
-          "val": "\"<%= bar %>\"",
+          "val": "\\"<%= bar %>\\"",
         },
       ],
       "block": Object {
@@ -6765,7 +6770,7 @@ Object {
           "line": 2,
           "mustEscape": true,
           "name": "class",
-          "val": "\"<%= bar %>\"",
+          "val": "\\"<%= bar %>\\"",
         },
       ],
       "block": Object {
@@ -6791,7 +6796,7 @@ Object {
           "line": 3,
           "mustEscape": false,
           "name": "attr",
-          "val": "\"<%= bar %>\"",
+          "val": "\\"<%= bar %>\\"",
         },
       ],
       "block": Object {
@@ -6817,7 +6822,7 @@ Object {
           "line": 4,
           "mustEscape": false,
           "name": "class",
-          "val": "\"<%= bar %>\"",
+          "val": "\\"<%= bar %>\\"",
         },
       ],
       "block": Object {
@@ -6843,7 +6848,7 @@ Object {
           "line": 5,
           "mustEscape": false,
           "name": "class",
-          "val": "\"<%= bar %> lol rofl\"",
+          "val": "\\"<%= bar %> lol rofl\\"",
         },
       ],
       "block": Object {
@@ -6869,7 +6874,7 @@ Object {
           "line": 6,
           "mustEscape": false,
           "name": "class",
-          "val": "\"<%= bar %> lol rofl <%= lmao %>\"",
+          "val": "\\"<%= bar %> lol rofl <%= lmao %>\\"",
         },
       ],
       "block": Object {
@@ -6891,7 +6896,7 @@ Object {
 }
 `;
 
-exports[`test filter-in-include.tokens.json 1`] = `
+exports[`filter-in-include.tokens.json 1`] = `
 Object {
   "filename": "filter-in-include.tokens.json",
   "line": 0,
@@ -6920,7 +6925,7 @@ Object {
 }
 `;
 
-exports[`test filters.coffeescript.tokens.json 1`] = `
+exports[`filters.coffeescript.tokens.json 1`] = `
 Object {
   "filename": "filters.coffeescript.tokens.json",
   "line": 0,
@@ -6934,7 +6939,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/javascript\'",
+          "val": "'text/javascript'",
         },
       ],
       "block": Object {
@@ -6952,7 +6957,7 @@ Object {
                   "filename": "filters.coffeescript.tokens.json",
                   "line": 3,
                   "type": "Text",
-                  "val": "regexp = /\\n/",
+                  "val": "regexp = /\\\\n/",
                 },
               ],
               "type": "Block",
@@ -7025,7 +7030,7 @@ Object {
 }
 `;
 
-exports[`test filters.custom.tokens.json 1`] = `
+exports[`filters.custom.tokens.json 1`] = `
 Object {
   "filename": "filters.custom.tokens.json",
   "line": 0,
@@ -7052,7 +7057,7 @@ Object {
                       "line": 3,
                       "mustEscape": true,
                       "name": "opt",
-                      "val": "\'val\'",
+                      "val": "'val'",
                     },
                     Object {
                       "column": 23,
@@ -7155,7 +7160,7 @@ Object {
 }
 `;
 
-exports[`test filters.include.custom.tokens.json 1`] = `
+exports[`filters.include.custom.tokens.json 1`] = `
 Object {
   "filename": "filters.include.custom.tokens.json",
   "line": 0,
@@ -7200,7 +7205,7 @@ Object {
                                 "line": 4,
                                 "mustEscape": true,
                                 "name": "opt",
-                                "val": "\'val\'",
+                                "val": "'val'",
                               },
                               Object {
                                 "column": 32,
@@ -7259,7 +7264,7 @@ Object {
 }
 `;
 
-exports[`test filters.include.tokens.json 1`] = `
+exports[`filters.include.tokens.json 1`] = `
 Object {
   "filename": "filters.include.tokens.json",
   "line": 0,
@@ -7436,7 +7441,7 @@ Object {
 }
 `;
 
-exports[`test filters.inline.tokens.json 1`] = `
+exports[`filters.inline.tokens.json 1`] = `
 Object {
   "filename": "filters.inline.tokens.json",
   "line": 0,
@@ -7500,7 +7505,7 @@ Object {
 }
 `;
 
-exports[`test filters.less.tokens.json 1`] = `
+exports[`filters.less.tokens.json 1`] = `
 Object {
   "filename": "filters.less.tokens.json",
   "line": 0,
@@ -7528,7 +7533,7 @@ Object {
                       "line": 3,
                       "mustEscape": true,
                       "name": "type",
-                      "val": "\"text/css\"",
+                      "val": "\\"text/css\\"",
                     },
                   ],
                   "block": Object {
@@ -7640,7 +7645,7 @@ Object {
 }
 `;
 
-exports[`test filters.markdown.tokens.json 1`] = `
+exports[`filters.markdown.tokens.json 1`] = `
 Object {
   "filename": "filters.markdown.tokens.json",
   "line": 0,
@@ -7723,7 +7728,7 @@ Object {
 }
 `;
 
-exports[`test filters.nested.tokens.json 1`] = `
+exports[`filters.nested.tokens.json 1`] = `
 Object {
   "filename": "filters.nested.tokens.json",
   "line": 0,
@@ -7767,7 +7772,7 @@ Object {
                         "filename": "filters.nested.tokens.json",
                         "line": 4,
                         "type": "Text",
-                        "val": "  console.log(\'test\')",
+                        "val": "  console.log('test')",
                       },
                       Object {
                         "column": 1,
@@ -7858,7 +7863,7 @@ Object {
                               "filename": "filters.nested.tokens.json",
                               "line": 9,
                               "type": "Text",
-                              "val": "  console.log \'test\'",
+                              "val": "  console.log 'test'",
                             },
                             Object {
                               "column": 1,
@@ -7918,7 +7923,7 @@ Object {
 }
 `;
 
-exports[`test filters.stylus.tokens.json 1`] = `
+exports[`filters.stylus.tokens.json 1`] = `
 Object {
   "filename": "filters.stylus.tokens.json",
   "line": 0,
@@ -7946,7 +7951,7 @@ Object {
                       "line": 3,
                       "mustEscape": true,
                       "name": "type",
-                      "val": "\"text/css\"",
+                      "val": "\\"text/css\\"",
                     },
                   ],
                   "block": Object {
@@ -8045,7 +8050,7 @@ Object {
 }
 `;
 
-exports[`test filters.verbatim.tokens.json 1`] = `
+exports[`filters.verbatim.tokens.json 1`] = `
 Object {
   "filename": "filters.verbatim.tokens.json",
   "line": 0,
@@ -8128,7 +8133,7 @@ Object {
 }
 `;
 
-exports[`test filters-empty.tokens.json 1`] = `
+exports[`filters-empty.tokens.json 1`] = `
 Object {
   "filename": "filters-empty.tokens.json",
   "line": 0,
@@ -8141,7 +8146,7 @@ Object {
       "line": 1,
       "mustEscape": false,
       "type": "Code",
-      "val": "var users = [{ name: \'tobi\', age: 2 }]",
+      "val": "var users = [{ name: 'tobi', age: 2 }]",
     },
     Object {
       "attributeBlocks": Array [],
@@ -8223,7 +8228,7 @@ Object {
 }
 `;
 
-exports[`test html.tokens.json 1`] = `
+exports[`html.tokens.json 1`] = `
 Object {
   "filename": "html.tokens.json",
   "line": 0,
@@ -8326,7 +8331,7 @@ Object {
 }
 `;
 
-exports[`test html5.tokens.json 1`] = `
+exports[`html5.tokens.json 1`] = `
 Object {
   "filename": "html5.tokens.json",
   "line": 0,
@@ -8347,7 +8352,7 @@ Object {
           "line": 2,
           "mustEscape": true,
           "name": "type",
-          "val": "\'checkbox\'",
+          "val": "'checkbox'",
         },
         Object {
           "column": 24,
@@ -8381,7 +8386,7 @@ Object {
           "line": 3,
           "mustEscape": true,
           "name": "type",
-          "val": "\'checkbox\'",
+          "val": "'checkbox'",
         },
         Object {
           "column": 24,
@@ -8415,7 +8420,7 @@ Object {
           "line": 4,
           "mustEscape": true,
           "name": "type",
-          "val": "\'checkbox\'",
+          "val": "'checkbox'",
         },
         Object {
           "column": 24,
@@ -8445,7 +8450,7 @@ Object {
 }
 `;
 
-exports[`test include.script.tokens.json 1`] = `
+exports[`include.script.tokens.json 1`] = `
 Object {
   "filename": "include.script.tokens.json",
   "line": 0,
@@ -8459,7 +8464,7 @@ Object {
           "line": 1,
           "mustEscape": false,
           "name": "id",
-          "val": "\'pet-template\'",
+          "val": "'pet-template'",
         },
         Object {
           "column": 21,
@@ -8467,7 +8472,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/x-template\'",
+          "val": "'text/x-template'",
         },
       ],
       "block": Object {
@@ -8509,7 +8514,7 @@ Object {
 }
 `;
 
-exports[`test include.yield.nested.tokens.json 1`] = `
+exports[`include.yield.nested.tokens.json 1`] = `
 Object {
   "filename": "include.yield.nested.tokens.json",
   "line": 0,
@@ -8589,7 +8594,7 @@ Object {
 }
 `;
 
-exports[`test include-extends-from-root.tokens.json 1`] = `
+exports[`include-extends-from-root.tokens.json 1`] = `
 Object {
   "filename": "include-extends-from-root.tokens.json",
   "line": 0,
@@ -8618,7 +8623,7 @@ Object {
 }
 `;
 
-exports[`test include-extends-of-common-template.tokens.json 1`] = `
+exports[`include-extends-of-common-template.tokens.json 1`] = `
 Object {
   "filename": "include-extends-of-common-template.tokens.json",
   "line": 0,
@@ -8666,7 +8671,7 @@ Object {
 }
 `;
 
-exports[`test include-extends-relative.tokens.json 1`] = `
+exports[`include-extends-relative.tokens.json 1`] = `
 Object {
   "filename": "include-extends-relative.tokens.json",
   "line": 0,
@@ -8695,7 +8700,7 @@ Object {
 }
 `;
 
-exports[`test include-only-text.tokens.json 1`] = `
+exports[`include-only-text.tokens.json 1`] = `
 Object {
   "filename": "include-only-text.tokens.json",
   "line": 0,
@@ -8804,7 +8809,7 @@ Object {
 }
 `;
 
-exports[`test include-only-text-body.tokens.json 1`] = `
+exports[`include-only-text-body.tokens.json 1`] = `
 Object {
   "filename": "include-only-text-body.tokens.json",
   "line": 0,
@@ -8814,7 +8819,7 @@ Object {
       "filename": "include-only-text-body.tokens.json",
       "line": 1,
       "type": "Text",
-      "val": "The message is \"",
+      "val": "The message is \\"",
     },
     Object {
       "column": 1,
@@ -8827,14 +8832,14 @@ Object {
       "filename": "include-only-text-body.tokens.json",
       "line": 3,
       "type": "Text",
-      "val": "\"",
+      "val": "\\"",
     },
   ],
   "type": "Block",
 }
 `;
 
-exports[`test include-with-text.tokens.json 1`] = `
+exports[`include-with-text.tokens.json 1`] = `
 Object {
   "filename": "include-with-text.tokens.json",
   "line": 0,
@@ -8860,7 +8865,7 @@ Object {
                       "line": 3,
                       "mustEscape": true,
                       "name": "src",
-                      "val": "\'/caustic.js\'",
+                      "val": "'/caustic.js'",
                     },
                   ],
                   "block": Object {
@@ -8886,7 +8891,7 @@ Object {
                       "line": 4,
                       "mustEscape": true,
                       "name": "src",
-                      "val": "\'/app.js\'",
+                      "val": "'/app.js'",
                     },
                   ],
                   "block": Object {
@@ -8934,7 +8939,7 @@ Object {
 }
 `;
 
-exports[`test include-with-text-head.tokens.json 1`] = `
+exports[`include-with-text-head.tokens.json 1`] = `
 Object {
   "filename": "include-with-text-head.tokens.json",
   "line": 0,
@@ -8955,7 +8960,7 @@ Object {
                 "line": 2,
                 "mustEscape": true,
                 "name": "type",
-                "val": "\'text/javascript\'",
+                "val": "'text/javascript'",
               },
             ],
             "block": Object {
@@ -8967,7 +8972,7 @@ Object {
                   "filename": "include-with-text-head.tokens.json",
                   "line": 3,
                   "type": "Text",
-                  "val": "alert(\'hello world\');",
+                  "val": "alert('hello world');",
                 },
               ],
               "type": "Block",
@@ -8997,7 +9002,7 @@ Object {
 }
 `;
 
-exports[`test includes.tokens.json 1`] = `
+exports[`includes.tokens.json 1`] = `
 Object {
   "filename": "includes.tokens.json",
   "line": 0,
@@ -9077,7 +9082,7 @@ Object {
                 "line": 9,
                 "mustEscape": true,
                 "name": "type",
-                "val": "\"text/javascript\"",
+                "val": "\\"text/javascript\\"",
               },
             ],
             "block": Object {
@@ -9134,7 +9139,7 @@ Object {
 }
 `;
 
-exports[`test includes-with-ext-js.tokens.json 1`] = `
+exports[`includes-with-ext-js.tokens.json 1`] = `
 Object {
   "filename": "includes-with-ext-js.tokens.json",
   "line": 0,
@@ -9194,7 +9199,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.alert-dialog.tokens.json 1`] = `
+exports[`inheritance.alert-dialog.tokens.json 1`] = `
 Object {
   "filename": "inheritance.alert-dialog.tokens.json",
   "line": 0,
@@ -9256,7 +9261,7 @@ Object {
                 "filename": "inheritance.alert-dialog.tokens.json",
                 "line": 6,
                 "type": "Text",
-                "val": "I\'m an alert!",
+                "val": "I'm an alert!",
               },
             ],
             "type": "Block",
@@ -9277,7 +9282,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.defaults.tokens.json 1`] = `
+exports[`inheritance.defaults.tokens.json 1`] = `
 Object {
   "filename": "inheritance.defaults.tokens.json",
   "line": 0,
@@ -9312,7 +9317,7 @@ Object {
                           "line": 4,
                           "mustEscape": true,
                           "name": "src",
-                          "val": "\'jquery.js\'",
+                          "val": "'jquery.js'",
                         },
                       ],
                       "block": Object {
@@ -9338,7 +9343,7 @@ Object {
                           "line": 5,
                           "mustEscape": true,
                           "name": "src",
-                          "val": "\'keymaster.js\'",
+                          "val": "'keymaster.js'",
                         },
                       ],
                       "block": Object {
@@ -9364,7 +9369,7 @@ Object {
                           "line": 6,
                           "mustEscape": true,
                           "name": "src",
-                          "val": "\'caustic.js\'",
+                          "val": "'caustic.js'",
                         },
                       ],
                       "block": Object {
@@ -9411,7 +9416,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.extend.include.tokens.json 1`] = `
+exports[`inheritance.extend.include.tokens.json 1`] = `
 Object {
   "filename": "inheritance.extend.include.tokens.json",
   "line": 0,
@@ -9445,7 +9450,7 @@ Object {
               "line": 5,
               "mustEscape": true,
               "name": "src",
-              "val": "\'jquery.js\'",
+              "val": "'jquery.js'",
             },
           ],
           "block": Object {
@@ -9590,7 +9595,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.extend.mixins.block.tokens.json 1`] = `
+exports[`inheritance.extend.mixins.block.tokens.json 1`] = `
 Object {
   "filename": "inheritance.extend.mixins.block.tokens.json",
   "line": 0,
@@ -9648,7 +9653,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.extend.mixins.tokens.json 1`] = `
+exports[`inheritance.extend.mixins.tokens.json 1`] = `
 Object {
   "filename": "inheritance.extend.mixins.tokens.json",
   "line": 0,
@@ -9739,7 +9744,7 @@ Object {
       "name": "content",
       "nodes": Array [
         Object {
-          "args": "\"The meaning of life\"",
+          "args": "\\"The meaning of life\\"",
           "attributeBlocks": Array [],
           "attrs": Array [],
           "block": Object {
@@ -9789,7 +9794,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.extend.recursive.tokens.json 1`] = `
+exports[`inheritance.extend.recursive.tokens.json 1`] = `
 Object {
   "filename": "inheritance.extend.recursive.tokens.json",
   "line": 0,
@@ -9847,7 +9852,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.extend.tokens.json 1`] = `
+exports[`inheritance.extend.tokens.json 1`] = `
 Object {
   "filename": "inheritance.extend.tokens.json",
   "line": 0,
@@ -9881,7 +9886,7 @@ Object {
               "line": 5,
               "mustEscape": true,
               "name": "src",
-              "val": "\'jquery.js\'",
+              "val": "'jquery.js'",
             },
           ],
           "block": Object {
@@ -9966,7 +9971,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.extend.whitespace.tokens.json 1`] = `
+exports[`inheritance.extend.whitespace.tokens.json 1`] = `
 Object {
   "filename": "inheritance.extend.whitespace.tokens.json",
   "line": 0,
@@ -10000,7 +10005,7 @@ Object {
               "line": 6,
               "mustEscape": true,
               "name": "src",
-              "val": "\'jquery.js\'",
+              "val": "'jquery.js'",
             },
           ],
           "block": Object {
@@ -10085,7 +10090,7 @@ Object {
 }
 `;
 
-exports[`test inheritance.tokens.json 1`] = `
+exports[`inheritance.tokens.json 1`] = `
 Object {
   "filename": "inheritance.tokens.json",
   "line": 0,
@@ -10119,7 +10124,7 @@ Object {
               "line": 5,
               "mustEscape": true,
               "name": "src",
-              "val": "\'jquery.js\'",
+              "val": "'jquery.js'",
             },
           ],
           "block": Object {
@@ -10204,7 +10209,7 @@ Object {
 }
 `;
 
-exports[`test inline-block-comment.tokens.json 1`] = `
+exports[`inline-block-comment.tokens.json 1`] = `
 Object {
   "filename": "inline-block-comment.tokens.json",
   "line": 0,
@@ -10265,7 +10270,7 @@ Object {
 }
 `;
 
-exports[`test inline-tag.tokens.json 1`] = `
+exports[`inline-tag.tokens.json 1`] = `
 Object {
   "filename": "inline-tag.tokens.json",
   "line": 0,
@@ -10418,7 +10423,7 @@ Object {
                   "line": 6,
                   "mustEscape": true,
                   "type": "Code",
-                  "val": "\'[foo]\'",
+                  "val": "'[foo]'",
                 },
               ],
               "type": "Block",
@@ -10461,7 +10466,7 @@ Object {
             "line": 7,
             "mustEscape": false,
             "type": "Code",
-            "val": "var foo = \'foo]\'",
+            "val": "var foo = 'foo]'",
           },
           Object {
             "column": 24,
@@ -10603,7 +10608,7 @@ Object {
                   "line": 13,
                   "mustEscape": true,
                   "type": "Code",
-                  "val": "\'[foo]\'",
+                  "val": "'[foo]'",
                 },
               ],
               "type": "Block",
@@ -10646,7 +10651,7 @@ Object {
             "line": 14,
             "mustEscape": false,
             "type": "Code",
-            "val": "var foo = \'foo]\'",
+            "val": "var foo = 'foo]'",
           },
           Object {
             "column": 26,
@@ -10759,7 +10764,7 @@ Object {
 }
 `;
 
-exports[`test intepolated-elements.tokens.json 1`] = `
+exports[`intepolated-elements.tokens.json 1`] = `
 Object {
   "filename": "intepolated-elements.tokens.json",
   "line": 0,
@@ -10787,7 +10792,7 @@ Object {
                 "line": 1,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'rho\'",
+                "val": "'rho'",
               },
               Object {
                 "column": 11,
@@ -10795,7 +10800,7 @@ Object {
                 "line": 1,
                 "mustEscape": true,
                 "name": "href",
-                "val": "\'#\'",
+                "val": "'#'",
               },
               Object {
                 "column": 21,
@@ -10803,7 +10808,7 @@ Object {
                 "line": 1,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\'rho--modifier\'",
+                "val": "'rho--modifier'",
               },
             ],
             "block": Object {
@@ -10869,7 +10874,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'rho\'",
+                "val": "'rho'",
               },
               Object {
                 "column": 21,
@@ -10877,7 +10882,7 @@ Object {
                 "line": 2,
                 "mustEscape": true,
                 "name": "href",
-                "val": "\'#\'",
+                "val": "'#'",
               },
               Object {
                 "column": 31,
@@ -10885,7 +10890,7 @@ Object {
                 "line": 2,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\'rho--modifier\'",
+                "val": "'rho--modifier'",
               },
             ],
             "block": Object {
@@ -10943,7 +10948,7 @@ Object {
                 "line": 3,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'rho\'",
+                "val": "'rho'",
               },
               Object {
                 "column": 21,
@@ -10951,7 +10956,7 @@ Object {
                 "line": 3,
                 "mustEscape": true,
                 "name": "href",
-                "val": "\'#\'",
+                "val": "'#'",
               },
               Object {
                 "column": 31,
@@ -10959,7 +10964,7 @@ Object {
                 "line": 3,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\'rho--modifier\'",
+                "val": "'rho--modifier'",
               },
             ],
             "block": Object {
@@ -11007,7 +11012,7 @@ Object {
 }
 `;
 
-exports[`test interpolated-mixin.tokens.json 1`] = `
+exports[`interpolated-mixin.tokens.json 1`] = `
 Object {
   "filename": "interpolated-mixin.tokens.json",
   "line": 0,
@@ -11080,7 +11085,7 @@ Object {
             "val": "This also works ",
           },
           Object {
-            "args": "\'http://www.bing.com\'",
+            "args": "'http://www.bing.com'",
             "attributeBlocks": Array [],
             "attrs": Array [],
             "block": null,
@@ -11114,7 +11119,7 @@ Object {
 }
 `;
 
-exports[`test interpolation.escape.tokens.json 1`] = `
+exports[`interpolation.escape.tokens.json 1`] = `
 Object {
   "filename": "interpolation.escape.tokens.json",
   "line": 0,
@@ -11196,7 +11201,7 @@ Object {
             "line": 7,
             "mustEscape": true,
             "type": "Code",
-            "val": "\"is {\" + id + \"}\"",
+            "val": "\\"is {\\" + id + \\"}\\"",
           },
         ],
         "type": "Block",
@@ -11214,7 +11219,7 @@ Object {
 }
 `;
 
-exports[`test layout.append.tokens.json 1`] = `
+exports[`layout.append.tokens.json 1`] = `
 Object {
   "filename": "layout.append.tokens.json",
   "line": 0,
@@ -11248,7 +11253,7 @@ Object {
               "line": 5,
               "mustEscape": true,
               "name": "src",
-              "val": "\'foo.js\'",
+              "val": "'foo.js'",
             },
           ],
           "block": Object {
@@ -11274,7 +11279,7 @@ Object {
               "line": 6,
               "mustEscape": true,
               "name": "src",
-              "val": "\'bar.js\'",
+              "val": "'bar.js'",
             },
           ],
           "block": Object {
@@ -11299,7 +11304,7 @@ Object {
 }
 `;
 
-exports[`test layout.append.without-block.tokens.json 1`] = `
+exports[`layout.append.without-block.tokens.json 1`] = `
 Object {
   "filename": "layout.append.without-block.tokens.json",
   "line": 0,
@@ -11333,7 +11338,7 @@ Object {
               "line": 5,
               "mustEscape": true,
               "name": "src",
-              "val": "\'foo.js\'",
+              "val": "'foo.js'",
             },
           ],
           "block": Object {
@@ -11359,7 +11364,7 @@ Object {
               "line": 6,
               "mustEscape": true,
               "name": "src",
-              "val": "\'bar.js\'",
+              "val": "'bar.js'",
             },
           ],
           "block": Object {
@@ -11384,7 +11389,7 @@ Object {
 }
 `;
 
-exports[`test layout.multi.append.prepend.block.tokens.json 1`] = `
+exports[`layout.multi.append.prepend.block.tokens.json 1`] = `
 Object {
   "filename": "layout.multi.append.prepend.block.tokens.json",
   "line": 0,
@@ -11418,7 +11423,7 @@ Object {
               "line": 4,
               "mustEscape": false,
               "name": "class",
-              "val": "\'first\'",
+              "val": "'first'",
             },
             Object {
               "column": 9,
@@ -11426,7 +11431,7 @@ Object {
               "line": 4,
               "mustEscape": false,
               "name": "class",
-              "val": "\'append\'",
+              "val": "'append'",
             },
           ],
           "block": Object {
@@ -11470,7 +11475,7 @@ Object {
               "line": 7,
               "mustEscape": false,
               "name": "class",
-              "val": "\'first\'",
+              "val": "'first'",
             },
             Object {
               "column": 9,
@@ -11478,7 +11483,7 @@ Object {
               "line": 7,
               "mustEscape": false,
               "name": "class",
-              "val": "\'prepend\'",
+              "val": "'prepend'",
             },
           ],
           "block": Object {
@@ -11522,7 +11527,7 @@ Object {
               "line": 10,
               "mustEscape": false,
               "name": "class",
-              "val": "\'last\'",
+              "val": "'last'",
             },
             Object {
               "column": 8,
@@ -11530,7 +11535,7 @@ Object {
               "line": 10,
               "mustEscape": false,
               "name": "class",
-              "val": "\'append\'",
+              "val": "'append'",
             },
           ],
           "block": Object {
@@ -11574,7 +11579,7 @@ Object {
               "line": 13,
               "mustEscape": false,
               "name": "class",
-              "val": "\'last\'",
+              "val": "'last'",
             },
             Object {
               "column": 8,
@@ -11582,7 +11587,7 @@ Object {
               "line": 13,
               "mustEscape": false,
               "name": "class",
-              "val": "\'prepend\'",
+              "val": "'prepend'",
             },
           ],
           "block": Object {
@@ -11626,7 +11631,7 @@ Object {
               "line": 16,
               "mustEscape": true,
               "name": "src",
-              "val": "\'jquery.js\'",
+              "val": "'jquery.js'",
             },
           ],
           "block": Object {
@@ -11662,7 +11667,7 @@ Object {
               "line": 19,
               "mustEscape": true,
               "name": "src",
-              "val": "\'foo.js\'",
+              "val": "'foo.js'",
             },
           ],
           "block": Object {
@@ -11687,7 +11692,7 @@ Object {
 }
 `;
 
-exports[`test layout.prepend.tokens.json 1`] = `
+exports[`layout.prepend.tokens.json 1`] = `
 Object {
   "filename": "layout.prepend.tokens.json",
   "line": 0,
@@ -11721,7 +11726,7 @@ Object {
               "line": 5,
               "mustEscape": true,
               "name": "src",
-              "val": "\'foo.js\'",
+              "val": "'foo.js'",
             },
           ],
           "block": Object {
@@ -11747,7 +11752,7 @@ Object {
               "line": 6,
               "mustEscape": true,
               "name": "src",
-              "val": "\'bar.js\'",
+              "val": "'bar.js'",
             },
           ],
           "block": Object {
@@ -11772,7 +11777,7 @@ Object {
 }
 `;
 
-exports[`test layout.prepend.without-block.tokens.json 1`] = `
+exports[`layout.prepend.without-block.tokens.json 1`] = `
 Object {
   "filename": "layout.prepend.without-block.tokens.json",
   "line": 0,
@@ -11806,7 +11811,7 @@ Object {
               "line": 5,
               "mustEscape": true,
               "name": "src",
-              "val": "\'foo.js\'",
+              "val": "'foo.js'",
             },
           ],
           "block": Object {
@@ -11832,7 +11837,7 @@ Object {
               "line": 6,
               "mustEscape": true,
               "name": "src",
-              "val": "\'bar.js\'",
+              "val": "'bar.js'",
             },
           ],
           "block": Object {
@@ -11857,7 +11862,7 @@ Object {
 }
 `;
 
-exports[`test mixin.attrs.tokens.json 1`] = `
+exports[`mixin.attrs.tokens.json 1`] = `
 Object {
   "filename": "mixin.attrs.tokens.json",
   "line": 0,
@@ -11877,7 +11882,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'centered\'",
+                "val": "'centered'",
               },
               Object {
                 "column": 16,
@@ -11966,7 +11971,7 @@ Object {
                             "line": 7,
                             "mustEscape": false,
                             "name": "class",
-                            "val": "\'footer\'",
+                            "val": "'footer'",
                           },
                         ],
                         "block": Object {
@@ -12066,7 +12071,7 @@ Object {
                 "line": 11,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'stretch\'",
+                "val": "'stretch'",
               },
             ],
             "block": Object {
@@ -12091,7 +12096,7 @@ Object {
                       "line": 12,
                       "mustEscape": false,
                       "name": "class",
-                      "val": "\'highlight\'",
+                      "val": "'highlight'",
                     },
                   ],
                   "block": Object {
@@ -12158,7 +12163,7 @@ Object {
                 "line": 16,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'bottom\'",
+                "val": "'bottom'",
               },
             ],
             "block": Object {
@@ -12209,7 +12214,7 @@ Object {
                 "line": 20,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'First\'",
+                "val": "'First'",
               },
             ],
             "block": Object {
@@ -12234,7 +12239,7 @@ Object {
             "type": "Mixin",
           },
           Object {
-            "args": "\'Section 1\'",
+            "args": "'Section 1'",
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
@@ -12243,7 +12248,7 @@ Object {
                 "line": 21,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'Second\'",
+                "val": "'Second'",
               },
             ],
             "block": Object {
@@ -12286,7 +12291,7 @@ Object {
             "type": "Mixin",
           },
           Object {
-            "args": "\'Section 2\'",
+            "args": "'Section 2'",
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
@@ -12295,7 +12300,7 @@ Object {
                 "line": 23,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'Third\'",
+                "val": "'Third'",
               },
               Object {
                 "column": 31,
@@ -12303,7 +12308,7 @@ Object {
                 "line": 23,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'foo\'",
+                "val": "'foo'",
               },
               Object {
                 "column": 36,
@@ -12311,7 +12316,7 @@ Object {
                 "line": 23,
                 "mustEscape": true,
                 "name": "href",
-                "val": "\'menu.html\'",
+                "val": "'menu.html'",
               },
               Object {
                 "column": 54,
@@ -12319,7 +12324,7 @@ Object {
                 "line": 23,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -12362,7 +12367,7 @@ Object {
             "type": "Mixin",
           },
           Object {
-            "args": "\'Section 3\'",
+            "args": "'Section 3'",
             "attributeBlocks": Array [],
             "attrs": Array [
               Object {
@@ -12371,7 +12376,7 @@ Object {
                 "line": 25,
                 "mustEscape": true,
                 "name": "href",
-                "val": "\'#\'",
+                "val": "'#'",
               },
             ],
             "block": Object {
@@ -12423,7 +12428,7 @@ Object {
                 "line": 27,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'foo\'",
+                "val": "'foo'",
               },
               Object {
                 "column": 15,
@@ -12431,7 +12436,7 @@ Object {
                 "line": 27,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
               Object {
                 "column": 28,
@@ -12439,7 +12444,7 @@ Object {
                 "line": 27,
                 "mustEscape": true,
                 "name": "name",
-                "val": "\'end\'",
+                "val": "'end'",
               },
               Object {
                 "column": 40,
@@ -12447,7 +12452,7 @@ Object {
                 "line": 27,
                 "mustEscape": true,
                 "name": "id",
-                "val": "\'Last\'",
+                "val": "'Last'",
               },
               Object {
                 "column": 51,
@@ -12455,7 +12460,7 @@ Object {
                 "line": 27,
                 "mustEscape": true,
                 "name": "data-attr",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
             ],
             "block": Object {
@@ -12507,7 +12512,7 @@ Object {
                 "line": 29,
                 "mustEscape": true,
                 "name": "class",
-                "val": "[\'class1\', \'class2\']",
+                "val": "['class1', 'class2']",
               },
             ],
             "block": null,
@@ -12552,7 +12557,7 @@ Object {
                 "line": 32,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'thing\'",
+                "val": "'thing'",
               },
               Object {
                 "column": 13,
@@ -12560,7 +12565,7 @@ Object {
                 "line": 32,
                 "mustEscape": true,
                 "name": "attr1",
-                "val": "\'foo\'",
+                "val": "'foo'",
               },
               Object {
                 "column": 26,
@@ -12568,7 +12573,7 @@ Object {
                 "line": 32,
                 "mustEscape": true,
                 "name": "attr2",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -12603,7 +12608,7 @@ Object {
       "line": 34,
       "mustEscape": false,
       "type": "Code",
-      "val": "var val = \'<biz>\'",
+      "val": "var val = '<biz>'",
     },
     Object {
       "buffer": false,
@@ -12613,7 +12618,7 @@ Object {
       "line": 35,
       "mustEscape": false,
       "type": "Code",
-      "val": "var classes = [\'foo\', \'bar\']",
+      "val": "var classes = ['foo', 'bar']",
     },
     Object {
       "args": null,
@@ -12625,7 +12630,7 @@ Object {
           "line": 36,
           "mustEscape": true,
           "name": "attr3",
-          "val": "\'baz\'",
+          "val": "'baz'",
         },
         Object {
           "column": 18,
@@ -12657,7 +12662,7 @@ Object {
           "line": 36,
           "mustEscape": false,
           "name": "class",
-          "val": "\'thunk\'",
+          "val": "'thunk'",
         },
       ],
       "block": null,
@@ -12729,7 +12734,7 @@ Object {
       "type": "Mixin",
     },
     Object {
-      "args": "\'work\'",
+      "args": "'work'",
       "attributeBlocks": Array [],
       "attrs": Array [
         Object {
@@ -12738,7 +12743,7 @@ Object {
           "line": 41,
           "mustEscape": true,
           "name": "data-profile",
-          "val": "\'profile\'",
+          "val": "'profile'",
         },
         Object {
           "column": 56,
@@ -12746,7 +12751,7 @@ Object {
           "line": 41,
           "mustEscape": true,
           "name": "data-creator-name",
-          "val": "\'name\'",
+          "val": "'name'",
         },
       ],
       "block": null,
@@ -12895,7 +12900,7 @@ Object {
           "line": 50,
           "mustEscape": true,
           "name": "attr3",
-          "val": "\"qux\"",
+          "val": "\\"qux\\"",
         },
         Object {
           "column": 3,
@@ -12903,7 +12908,7 @@ Object {
           "line": 51,
           "mustEscape": true,
           "name": "class",
-          "val": "\"baz\"",
+          "val": "\\"baz\\"",
         },
       ],
       "block": null,
@@ -12916,10 +12921,10 @@ Object {
     },
     Object {
       "args": "
-\'1\',
-      \'2\',
-  \'3\',
-      \'4\'
+'1',
+      '2',
+  '3',
+      '4'
 ",
       "attributeBlocks": Array [],
       "attrs": Array [],
@@ -12936,7 +12941,7 @@ Object {
 }
 `;
 
-exports[`test mixin.block-tag-behaviour.tokens.json 1`] = `
+exports[`mixin.block-tag-behaviour.tokens.json 1`] = `
 Object {
   "filename": "mixin.block-tag-behaviour.tokens.json",
   "line": 0,
@@ -12956,7 +12961,7 @@ Object {
                 "line": 3,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'article\'",
+                "val": "'article'",
               },
             ],
             "block": Object {
@@ -13033,7 +13038,7 @@ Object {
               "line": 8,
               "nodes": Array [
                 Object {
-                  "args": "\'Foo\'",
+                  "args": "'Foo'",
                   "attributeBlocks": Array [],
                   "attrs": Array [],
                   "block": Object {
@@ -13052,7 +13057,7 @@ Object {
                               "filename": "mixin.block-tag-behaviour.tokens.json",
                               "line": 9,
                               "type": "Text",
-                              "val": "I\'m article foo",
+                              "val": "I'm article foo",
                             },
                           ],
                           "type": "Block",
@@ -13112,7 +13117,7 @@ Object {
                 "line": 12,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'article\'",
+                "val": "'article'",
               },
             ],
             "block": Object {
@@ -13207,7 +13212,7 @@ Object {
               "line": 18,
               "nodes": Array [
                 Object {
-                  "args": "\'Something\'",
+                  "args": "'Something'",
                   "attributeBlocks": Array [],
                   "attrs": Array [],
                   "block": Object {
@@ -13219,7 +13224,7 @@ Object {
                         "filename": "mixin.block-tag-behaviour.tokens.json",
                         "line": 20,
                         "type": "Text",
-                        "val": "I\'m a much longer",
+                        "val": "I'm a much longer",
                       },
                       Object {
                         "column": 1,
@@ -13319,7 +13324,7 @@ Object {
 }
 `;
 
-exports[`test mixin.blocks.tokens.json 1`] = `
+exports[`mixin.blocks.tokens.json 1`] = `
 Object {
   "filename": "mixin.blocks.tokens.json",
   "line": 0,
@@ -13362,7 +13367,7 @@ Object {
                   "line": 5,
                   "mustEscape": false,
                   "type": "Code",
-                  "val": "var csrf_token_from_somewhere = \'hey\'",
+                  "val": "var csrf_token_from_somewhere = 'hey'",
                 },
                 Object {
                   "attributeBlocks": Array [],
@@ -13373,7 +13378,7 @@ Object {
                       "line": 6,
                       "mustEscape": true,
                       "name": "type",
-                      "val": "\'hidden\'",
+                      "val": "'hidden'",
                     },
                     Object {
                       "column": 26,
@@ -13381,7 +13386,7 @@ Object {
                       "line": 6,
                       "mustEscape": true,
                       "name": "name",
-                      "val": "\'_csrf\'",
+                      "val": "'_csrf'",
                     },
                     Object {
                       "column": 40,
@@ -13448,7 +13453,7 @@ Object {
               "line": 10,
               "nodes": Array [
                 Object {
-                  "args": "\'GET\', \'/search\'",
+                  "args": "'GET', '/search'",
                   "attributeBlocks": Array [],
                   "attrs": Array [],
                   "block": Object {
@@ -13464,7 +13469,7 @@ Object {
                             "line": 12,
                             "mustEscape": true,
                             "name": "type",
-                            "val": "\'text\'",
+                            "val": "'text'",
                           },
                           Object {
                             "column": 26,
@@ -13472,7 +13477,7 @@ Object {
                             "line": 12,
                             "mustEscape": true,
                             "name": "name",
-                            "val": "\'query\'",
+                            "val": "'query'",
                           },
                           Object {
                             "column": 40,
@@ -13480,7 +13485,7 @@ Object {
                             "line": 12,
                             "mustEscape": true,
                             "name": "placeholder",
-                            "val": "\'Search\'",
+                            "val": "'Search'",
                           },
                         ],
                         "block": Object {
@@ -13506,7 +13511,7 @@ Object {
                             "line": 13,
                             "mustEscape": true,
                             "name": "type",
-                            "val": "\'submit\'",
+                            "val": "'submit'",
                           },
                           Object {
                             "column": 28,
@@ -13514,7 +13519,7 @@ Object {
                             "line": 13,
                             "mustEscape": true,
                             "name": "value",
-                            "val": "\'Search\'",
+                            "val": "'Search'",
                           },
                         ],
                         "block": Object {
@@ -13578,7 +13583,7 @@ Object {
               "line": 16,
               "nodes": Array [
                 Object {
-                  "args": "\'POST\', \'/search\'",
+                  "args": "'POST', '/search'",
                   "attributeBlocks": Array [],
                   "attrs": Array [],
                   "block": Object {
@@ -13594,7 +13599,7 @@ Object {
                             "line": 18,
                             "mustEscape": true,
                             "name": "type",
-                            "val": "\'text\'",
+                            "val": "'text'",
                           },
                           Object {
                             "column": 26,
@@ -13602,7 +13607,7 @@ Object {
                             "line": 18,
                             "mustEscape": true,
                             "name": "name",
-                            "val": "\'query\'",
+                            "val": "'query'",
                           },
                           Object {
                             "column": 40,
@@ -13610,7 +13615,7 @@ Object {
                             "line": 18,
                             "mustEscape": true,
                             "name": "placeholder",
-                            "val": "\'Search\'",
+                            "val": "'Search'",
                           },
                         ],
                         "block": Object {
@@ -13636,7 +13641,7 @@ Object {
                             "line": 19,
                             "mustEscape": true,
                             "name": "type",
-                            "val": "\'submit\'",
+                            "val": "'submit'",
                           },
                           Object {
                             "column": 28,
@@ -13644,7 +13649,7 @@ Object {
                             "line": 19,
                             "mustEscape": true,
                             "name": "value",
-                            "val": "\'Search\'",
+                            "val": "'Search'",
                           },
                         ],
                         "block": Object {
@@ -13708,7 +13713,7 @@ Object {
               "line": 22,
               "nodes": Array [
                 Object {
-                  "args": "\'POST\', \'/search\'",
+                  "args": "'POST', '/search'",
                   "attributeBlocks": Array [],
                   "attrs": Array [],
                   "block": null,
@@ -13756,7 +13761,7 @@ Object {
                 "line": 26,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -13805,7 +13810,7 @@ Object {
                 "line": 30,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'foo\'",
+                "val": "'foo'",
               },
             ],
             "block": Object {
@@ -13965,7 +13970,7 @@ Object {
                 "line": 41,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
             ],
             "block": Object {
@@ -14015,7 +14020,7 @@ Object {
             "line": 44,
             "mustEscape": true,
             "type": "Code",
-            "val": "\'123\'",
+            "val": "'123'",
           },
         ],
         "type": "Block",
@@ -14032,7 +14037,7 @@ Object {
 }
 `;
 
-exports[`test mixin.merge.tokens.json 1`] = `
+exports[`mixin.merge.tokens.json 1`] = `
 Object {
   "filename": "mixin.merge.tokens.json",
   "line": 0,
@@ -14060,7 +14065,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
             ],
             "block": Object {
@@ -14102,7 +14107,7 @@ Object {
                 "line": 3,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
               Object {
                 "column": 8,
@@ -14110,7 +14115,7 @@ Object {
                 "line": 3,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'quux\'",
+                "val": "'quux'",
               },
             ],
             "block": Object {
@@ -14185,7 +14190,7 @@ Object {
                 "line": 5,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'bar\'",
+                "val": "'bar'",
               },
               Object {
                 "column": 32,
@@ -14193,7 +14198,7 @@ Object {
                 "line": 5,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\"baz\"",
+                "val": "\\"baz\\"",
               },
             ],
             "block": Object {
@@ -14245,7 +14250,7 @@ Object {
                 "line": 8,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'hello\'",
+                "val": "'hello'",
               },
             ],
             "block": null,
@@ -14266,7 +14271,7 @@ Object {
                 "line": 9,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'world\'",
+                "val": "'world'",
               },
             ],
             "block": null,
@@ -14287,7 +14292,7 @@ Object {
                 "line": 10,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'hello\'",
+                "val": "'hello'",
               },
               Object {
                 "column": 13,
@@ -14295,7 +14300,7 @@ Object {
                 "line": 10,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'world\'",
+                "val": "'world'",
               },
             ],
             "block": null,
@@ -14316,7 +14321,7 @@ Object {
                 "line": 11,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'hello\'",
+                "val": "'hello'",
               },
               Object {
                 "column": 13,
@@ -14324,7 +14329,7 @@ Object {
                 "line": 11,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'world\'",
+                "val": "'world'",
               },
             ],
             "block": null,
@@ -14345,7 +14350,7 @@ Object {
                 "line": 12,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\"hello\"",
+                "val": "\\"hello\\"",
               },
             ],
             "block": null,
@@ -14366,7 +14371,7 @@ Object {
                 "line": 13,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'hello\'",
+                "val": "'hello'",
               },
               Object {
                 "column": 14,
@@ -14374,7 +14379,7 @@ Object {
                 "line": 13,
                 "mustEscape": true,
                 "name": "class",
-                "val": "\"world\"",
+                "val": "\\"world\\"",
               },
             ],
             "block": null,
@@ -14405,7 +14410,7 @@ Object {
                 "filename": "mixin.merge.tokens.json",
                 "line": 15,
                 "type": "AttributeBlock",
-                "val": "{class: \"hello\"}",
+                "val": "{class: \\"hello\\"}",
               },
             ],
             "attrs": Array [],
@@ -14433,7 +14438,7 @@ Object {
 }
 `;
 
-exports[`test mixin-at-end-of-file.tokens.json 1`] = `
+exports[`mixin-at-end-of-file.tokens.json 1`] = `
 Object {
   "filename": "mixin-at-end-of-file.tokens.json",
   "line": 0,
@@ -14505,7 +14510,7 @@ Object {
 }
 `;
 
-exports[`test mixin-block-with-space.tokens.json 1`] = `
+exports[`mixin-block-with-space.tokens.json 1`] = `
 Object {
   "filename": "mixin-block-with-space.tokens.json",
   "line": 0,
@@ -14580,7 +14585,7 @@ Object {
 }
 `;
 
-exports[`test mixin-hoist.tokens.json 1`] = `
+exports[`mixin-hoist.tokens.json 1`] = `
 Object {
   "filename": "mixin-hoist.tokens.json",
   "line": 0,
@@ -14682,7 +14687,7 @@ Object {
 }
 `;
 
-exports[`test mixin-via-include.tokens.json 1`] = `
+exports[`mixin-via-include.tokens.json 1`] = `
 Object {
   "filename": "mixin-via-include.tokens.json",
   "line": 0,
@@ -14731,7 +14736,7 @@ Object {
 }
 `;
 
-exports[`test mixins.rest-args.tokens.json 1`] = `
+exports[`mixins.rest-args.tokens.json 1`] = `
 Object {
   "filename": "mixins.rest-args.tokens.json",
   "line": 0,
@@ -14815,7 +14820,7 @@ Object {
       "type": "Mixin",
     },
     Object {
-      "args": "\'ul\', 1, 2, 3, 4",
+      "args": "'ul', 1, 2, 3, 4",
       "attributeBlocks": Array [],
       "attrs": Array [],
       "block": null,
@@ -14831,7 +14836,7 @@ Object {
 }
 `;
 
-exports[`test mixins.tokens.json 1`] = `
+exports[`mixins.tokens.json 1`] = `
 Object {
   "filename": "mixins.tokens.json",
   "line": 0,
@@ -14851,7 +14856,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'comment\'",
+                "val": "'comment'",
               },
             ],
             "block": Object {
@@ -14895,7 +14900,7 @@ Object {
                       "line": 4,
                       "mustEscape": false,
                       "name": "class",
-                      "val": "\'body\'",
+                      "val": "'body'",
                     },
                   ],
                   "block": Object {
@@ -14959,7 +14964,7 @@ Object {
                 "line": 8,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'comment\'",
+                "val": "'comment'",
               },
             ],
             "block": Object {
@@ -15003,7 +15008,7 @@ Object {
                       "line": 10,
                       "mustEscape": false,
                       "name": "class",
-                      "val": "\'body\'",
+                      "val": "'body'",
                     },
                   ],
                   "block": Object {
@@ -15061,7 +15066,7 @@ Object {
           "line": 12,
           "mustEscape": false,
           "name": "id",
-          "val": "\'user\'",
+          "val": "'user'",
         },
       ],
       "block": Object {
@@ -15102,7 +15107,7 @@ Object {
                 "line": 14,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'comments\'",
+                "val": "'comments'",
               },
             ],
             "block": Object {
@@ -15110,8 +15115,8 @@ Object {
               "line": 14,
               "nodes": Array [
                 Object {
-                  "args": "\'This\',
-            ((\'is regular, javascript\'))",
+                  "args": "'This',
+            (('is regular, javascript'))",
                   "attributeBlocks": Array [],
                   "attrs": Array [],
                   "block": null,
@@ -15310,7 +15315,7 @@ Object {
                 "line": 29,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'interpolation\'",
+                "val": "'interpolation'",
               },
             ],
             "block": Object {
@@ -15325,7 +15330,7 @@ Object {
                   "line": 29,
                   "mustEscape": true,
                   "type": "Code",
-                  "val": "str + \'interpolated\'",
+                  "val": "str + 'interpolated'",
                 },
               ],
               "type": "Block",
@@ -15356,10 +15361,10 @@ Object {
       "line": 31,
       "mustEscape": false,
       "type": "Code",
-      "val": "var suffix = \"bar\"",
+      "val": "var suffix = \\"bar\\"",
     },
     Object {
-      "args": "\'This is \'",
+      "args": "'This is '",
       "attributeBlocks": Array [],
       "attrs": Array [],
       "block": null,
@@ -15367,7 +15372,7 @@ Object {
       "column": 1,
       "filename": "mixins.tokens.json",
       "line": 32,
-      "name": "#{\'foo\' + suffix}",
+      "name": "#{'foo' + suffix}",
       "type": "Mixin",
     },
   ],
@@ -15375,7 +15380,7 @@ Object {
 }
 `;
 
-exports[`test mixins-unused.tokens.json 1`] = `
+exports[`mixins-unused.tokens.json 1`] = `
 Object {
   "filename": "mixins-unused.tokens.json",
   "line": 0,
@@ -15395,7 +15400,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "class",
-                "val": "\'wtf\'",
+                "val": "'wtf'",
               },
             ],
             "block": Object {
@@ -15407,7 +15412,7 @@ Object {
                   "filename": "mixins-unused.tokens.json",
                   "line": 2,
                   "type": "Text",
-                  "val": "This isn\'t something we ever want to output",
+                  "val": "This isn't something we ever want to output",
                 },
               ],
               "type": "Block",
@@ -15452,7 +15457,7 @@ Object {
 }
 `;
 
-exports[`test namespaces.tokens.json 1`] = `
+exports[`namespaces.tokens.json 1`] = `
 Object {
   "filename": "namespaces.tokens.json",
   "line": 0,
@@ -15491,7 +15496,7 @@ Object {
           "line": 2,
           "mustEscape": true,
           "name": "fb:foo",
-          "val": "\'bar\'",
+          "val": "'bar'",
         },
       ],
       "block": Object {
@@ -15513,7 +15518,7 @@ Object {
 }
 `;
 
-exports[`test nesting.tokens.json 1`] = `
+exports[`nesting.tokens.json 1`] = `
 Object {
   "filename": "nesting.tokens.json",
   "line": 0,
@@ -15702,7 +15707,7 @@ Object {
 }
 `;
 
-exports[`test pipeless-comments.tokens.json 1`] = `
+exports[`pipeless-comments.tokens.json 1`] = `
 Object {
   "filename": "pipeless-comments.tokens.json",
   "line": 0,
@@ -15764,7 +15769,7 @@ Object {
 }
 `;
 
-exports[`test pipeless-filters.tokens.json 1`] = `
+exports[`pipeless-filters.tokens.json 1`] = `
 Object {
   "filename": "pipeless-filters.tokens.json",
   "line": 0,
@@ -15826,7 +15831,7 @@ Object {
 }
 `;
 
-exports[`test pipeless-tag.tokens.json 1`] = `
+exports[`pipeless-tag.tokens.json 1`] = `
 Object {
   "filename": "pipeless-tag.tokens.json",
   "line": 0,
@@ -15868,7 +15873,7 @@ Object {
             "line": 3,
             "mustEscape": true,
             "type": "Code",
-            "val": "\'going\'",
+            "val": "'going'",
           },
           Object {
             "column": 16,
@@ -15885,7 +15890,7 @@ Object {
             "line": 3,
             "mustEscape": true,
             "type": "Code",
-            "val": "\'on\'",
+            "val": "'on'",
           },
           Object {
             "column": 29,
@@ -15911,7 +15916,7 @@ Object {
 }
 `;
 
-exports[`test pre.tokens.json 1`] = `
+exports[`pre.tokens.json 1`] = `
 Object {
   "filename": "pre.tokens.json",
   "line": 0,
@@ -16066,7 +16071,7 @@ Object {
 }
 `;
 
-exports[`test quotes.tokens.json 1`] = `
+exports[`quotes.tokens.json 1`] = `
 Object {
   "filename": "quotes.tokens.json",
   "line": 0,
@@ -16083,7 +16088,7 @@ Object {
             "filename": "quotes.tokens.json",
             "line": 1,
             "type": "Text",
-            "val": "\"foo\"",
+            "val": "\\"foo\\"",
           },
         ],
         "type": "Block",
@@ -16108,7 +16113,7 @@ Object {
             "filename": "quotes.tokens.json",
             "line": 2,
             "type": "Text",
-            "val": "\'foo\'",
+            "val": "'foo'",
           },
         ],
         "type": "Block",
@@ -16126,7 +16131,7 @@ Object {
 }
 `;
 
-exports[`test regression.784.tokens.json 1`] = `
+exports[`regression.784.tokens.json 1`] = `
 Object {
   "filename": "regression.784.tokens.json",
   "line": 0,
@@ -16139,7 +16144,7 @@ Object {
       "line": 1,
       "mustEscape": false,
       "type": "Code",
-      "val": "var url = \'http://www.google.com\'",
+      "val": "var url = 'http://www.google.com'",
     },
     Object {
       "attributeBlocks": Array [],
@@ -16150,7 +16155,7 @@ Object {
           "line": 2,
           "mustEscape": false,
           "name": "class",
-          "val": "\'url\'",
+          "val": "'url'",
         },
       ],
       "block": Object {
@@ -16165,7 +16170,7 @@ Object {
             "line": 2,
             "mustEscape": true,
             "type": "Code",
-            "val": "url.replace(\'http://\', \'\').replace(/^www\\./, \'\')",
+            "val": "url.replace('http://', '').replace(/^www\\\\./, '')",
           },
         ],
         "type": "Block",
@@ -16183,7 +16188,7 @@ Object {
 }
 `;
 
-exports[`test regression.1794.tokens.json 1`] = `
+exports[`regression.1794.tokens.json 1`] = `
 Object {
   "filename": "regression.1794.tokens.json",
   "line": 0,
@@ -16235,7 +16240,7 @@ Object {
 }
 `;
 
-exports[`test script.whitespace.tokens.json 1`] = `
+exports[`script.whitespace.tokens.json 1`] = `
 Object {
   "filename": "script.whitespace.tokens.json",
   "line": 0,
@@ -16331,7 +16336,7 @@ Object {
 }
 `;
 
-exports[`test scripts.non-js.tokens.json 1`] = `
+exports[`scripts.non-js.tokens.json 1`] = `
 Object {
   "filename": "scripts.non-js.tokens.json",
   "line": 0,
@@ -16345,7 +16350,7 @@ Object {
           "line": 1,
           "mustEscape": false,
           "name": "id",
-          "val": "\'user-template\'",
+          "val": "'user-template'",
         },
         Object {
           "column": 22,
@@ -16353,7 +16358,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/template\'",
+          "val": "'text/template'",
         },
       ],
       "block": Object {
@@ -16369,7 +16374,7 @@ Object {
                 "line": 2,
                 "mustEscape": false,
                 "name": "id",
-                "val": "\'user\'",
+                "val": "'user'",
               },
             ],
             "block": Object {
@@ -16457,7 +16462,7 @@ Object {
           "line": 6,
           "mustEscape": false,
           "name": "id",
-          "val": "\'user-template\'",
+          "val": "'user-template'",
         },
         Object {
           "column": 22,
@@ -16465,7 +16470,7 @@ Object {
           "line": 6,
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/template\'",
+          "val": "'text/template'",
         },
       ],
       "block": Object {
@@ -16526,7 +16531,7 @@ Object {
 }
 `;
 
-exports[`test scripts.tokens.json 1`] = `
+exports[`scripts.tokens.json 1`] = `
 Object {
   "filename": "scripts.tokens.json",
   "line": 0,
@@ -16602,7 +16607,7 @@ Object {
             "line": 5,
             "mustEscape": false,
             "type": "Code",
-            "val": "\'foo()\'",
+            "val": "'foo()'",
           },
         ],
         "type": "Block",
@@ -16679,7 +16684,7 @@ Object {
 }
 `;
 
-exports[`test self-closing-html.tokens.json 1`] = `
+exports[`self-closing-html.tokens.json 1`] = `
 Object {
   "filename": "self-closing-html.tokens.json",
   "line": 0,
@@ -16749,7 +16754,7 @@ Object {
 }
 `;
 
-exports[`test single-period.tokens.json 1`] = `
+exports[`single-period.tokens.json 1`] = `
 Object {
   "filename": "single-period.tokens.json",
   "line": 0,
@@ -16784,7 +16789,7 @@ Object {
 }
 `;
 
-exports[`test source.tokens.json 1`] = `
+exports[`source.tokens.json 1`] = `
 Object {
   "filename": "source.tokens.json",
   "line": 0,
@@ -16805,7 +16810,7 @@ Object {
                 "line": 2,
                 "mustEscape": true,
                 "name": "preload",
-                "val": "\'auto\'",
+                "val": "'auto'",
               },
               Object {
                 "column": 25,
@@ -16837,7 +16842,7 @@ Object {
                       "line": 3,
                       "mustEscape": true,
                       "name": "src",
-                      "val": "\'foo\'",
+                      "val": "'foo'",
                     },
                   ],
                   "block": Object {
@@ -16863,7 +16868,7 @@ Object {
                       "line": 4,
                       "mustEscape": true,
                       "name": "src",
-                      "val": "\'bar\'",
+                      "val": "'bar'",
                     },
                   ],
                   "block": Object {
@@ -16907,7 +16912,7 @@ Object {
 }
 `;
 
-exports[`test styles.tokens.json 1`] = `
+exports[`styles.tokens.json 1`] = `
 Object {
   "filename": "styles.tokens.json",
   "line": 0,
@@ -17009,7 +17014,7 @@ Object {
                       "line": 8,
                       "mustEscape": true,
                       "name": "style",
-                      "val": "\'color:red;background:green\'",
+                      "val": "'color:red;background:green'",
                     },
                   ],
                   "block": Object {
@@ -17035,7 +17040,7 @@ Object {
                       "line": 9,
                       "mustEscape": true,
                       "name": "style",
-                      "val": "{color: \'red\', background: \'green\'}",
+                      "val": "{color: 'red', background: 'green'}",
                     },
                   ],
                   "block": Object {
@@ -17059,7 +17064,7 @@ Object {
                       "filename": "styles.tokens.json",
                       "line": 10,
                       "type": "AttributeBlock",
-                      "val": "{style: \'color:red;background:green\'}",
+                      "val": "{style: 'color:red;background:green'}",
                     },
                   ],
                   "attrs": Array [],
@@ -17084,7 +17089,7 @@ Object {
                       "filename": "styles.tokens.json",
                       "line": 11,
                       "type": "AttributeBlock",
-                      "val": "{style: {color: \'red\', background: \'green\'}}",
+                      "val": "{style: {color: 'red', background: 'green'}}",
                     },
                   ],
                   "attrs": Array [],
@@ -17153,7 +17158,7 @@ Object {
                       "line": 14,
                       "mustEscape": true,
                       "name": "style",
-                      "val": "\'color:red;background:green\'",
+                      "val": "'color:red;background:green'",
                     },
                   ],
                   "block": null,
@@ -17174,7 +17179,7 @@ Object {
                       "line": 15,
                       "mustEscape": true,
                       "name": "style",
-                      "val": "{color: \'red\', background: \'green\'}",
+                      "val": "{color: 'red', background: 'green'}",
                     },
                   ],
                   "block": null,
@@ -17193,7 +17198,7 @@ Object {
                   "line": 16,
                   "mustEscape": false,
                   "type": "Code",
-                  "val": "var bg = \'green\';",
+                  "val": "var bg = 'green';",
                 },
                 Object {
                   "attributeBlocks": Array [],
@@ -17204,7 +17209,7 @@ Object {
                       "line": 17,
                       "mustEscape": true,
                       "name": "style",
-                      "val": "{color: \'red\', background: bg}",
+                      "val": "{color: 'red', background: bg}",
                     },
                   ],
                   "block": Object {
@@ -17228,7 +17233,7 @@ Object {
                       "filename": "styles.tokens.json",
                       "line": 18,
                       "type": "AttributeBlock",
-                      "val": "{style: {color: \'red\', background: bg}}",
+                      "val": "{style: {color: 'red', background: bg}}",
                     },
                   ],
                   "attrs": Array [],
@@ -17256,7 +17261,7 @@ Object {
                       "line": 19,
                       "mustEscape": true,
                       "name": "style",
-                      "val": "{color: \'red\', background: bg}",
+                      "val": "{color: 'red', background: bg}",
                     },
                   ],
                   "block": null,
@@ -17294,7 +17299,7 @@ Object {
 }
 `;
 
-exports[`test tag.interpolation.tokens.json 1`] = `
+exports[`tag.interpolation.tokens.json 1`] = `
 Object {
   "filename": "tag.interpolation.tokens.json",
   "line": 0,
@@ -17307,7 +17312,7 @@ Object {
       "line": 2,
       "mustEscape": false,
       "type": "Code",
-      "val": "var tag = \'p\'",
+      "val": "var tag = 'p'",
     },
     Object {
       "buffer": false,
@@ -17317,7 +17322,7 @@ Object {
       "line": 3,
       "mustEscape": false,
       "type": "Code",
-      "val": "var foo = \'bar\'",
+      "val": "var foo = 'bar'",
     },
     Object {
       "attributeBlocks": Array [],
@@ -17353,7 +17358,7 @@ Object {
           "line": 6,
           "mustEscape": true,
           "name": "foo",
-          "val": "\'bar\'",
+          "val": "'bar'",
         },
       ],
       "block": Object {
@@ -17405,7 +17410,7 @@ Object {
         "type": "Block",
       },
       "column": 1,
-      "expr": "foo ? \'a\' : \'li\'",
+      "expr": "foo ? 'a' : 'li'",
       "filename": "tag.interpolation.tokens.json",
       "isInline": false,
       "line": 7,
@@ -17454,7 +17459,7 @@ Object {
                                   "line": 17,
                                   "mustEscape": false,
                                   "name": "class",
-                                  "val": "\'icon\'",
+                                  "val": "'icon'",
                                 },
                                 Object {
                                   "column": 18,
@@ -17528,7 +17533,7 @@ Object {
                                   "line": 13,
                                   "mustEscape": false,
                                   "name": "class",
-                                  "val": "\'icon\'",
+                                  "val": "'icon'",
                                 },
                                 Object {
                                   "column": 18,
@@ -17607,7 +17612,7 @@ Object {
         "line": 20,
         "nodes": Array [
           Object {
-            "args": "\'contact\'",
+            "args": "'contact'",
             "attributeBlocks": Array [],
             "attrs": Array [],
             "block": Object {
@@ -17641,7 +17646,7 @@ Object {
                 "line": 22,
                 "mustEscape": true,
                 "name": "href",
-                "val": "\'/contact\'",
+                "val": "'/contact'",
               },
             ],
             "block": Object {
@@ -17681,7 +17686,7 @@ Object {
 }
 `;
 
-exports[`test tag-blocks.tokens.json 1`] = `
+exports[`tag-blocks.tokens.json 1`] = `
 Object {
   "filename": "tag-blocks.tokens.json",
   "line": 0,
@@ -17751,7 +17756,7 @@ Object {
             "line": 4,
             "mustEscape": true,
             "type": "Code",
-            "val": "\'  \'",
+            "val": "'  '",
           },
           Object {
             "column": 5,
@@ -17776,7 +17781,7 @@ Object {
 }
 `;
 
-exports[`test tags.self-closing.tokens.json 1`] = `
+exports[`tags.self-closing.tokens.json 1`] = `
 Object {
   "filename": "tags.self-closing.tokens.json",
   "line": 0,
@@ -17814,7 +17819,7 @@ Object {
                 "line": 4,
                 "mustEscape": true,
                 "name": "bar",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
             ],
             "block": Object {
@@ -17857,7 +17862,7 @@ Object {
                 "line": 6,
                 "mustEscape": true,
                 "name": "bar",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
             ],
             "block": Object {
@@ -17908,7 +17913,7 @@ Object {
                 "line": 8,
                 "mustEscape": true,
                 "name": "bar",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
             ],
             "block": Object {
@@ -17943,7 +17948,7 @@ Object {
               "type": "Block",
             },
             "column": 3,
-            "expr": "\'foo\'",
+            "expr": "'foo'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 9,
@@ -17959,7 +17964,7 @@ Object {
                 "line": 10,
                 "mustEscape": true,
                 "name": "bar",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
             ],
             "block": Object {
@@ -17969,7 +17974,7 @@ Object {
               "type": "Block",
             },
             "column": 3,
-            "expr": "\'foo\'",
+            "expr": "'foo'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 10,
@@ -17994,7 +17999,7 @@ Object {
               "type": "Block",
             },
             "column": 3,
-            "expr": "\'foo\'",
+            "expr": "'foo'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 11,
@@ -18010,7 +18015,7 @@ Object {
                 "line": 12,
                 "mustEscape": true,
                 "name": "bar",
-                "val": "\'baz\'",
+                "val": "'baz'",
               },
             ],
             "block": Object {
@@ -18028,7 +18033,7 @@ Object {
               "type": "Block",
             },
             "column": 3,
-            "expr": "\'foo\'",
+            "expr": "'foo'",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
             "line": 12,
@@ -18112,7 +18117,7 @@ Object {
             },
             "column": 3,
             "expr": "
-    \'foo\'
+    'foo'
   ",
             "filename": "tags.self-closing.tokens.json",
             "isInline": false,
@@ -18136,7 +18141,7 @@ Object {
 }
 `;
 
-exports[`test template.tokens.json 1`] = `
+exports[`template.tokens.json 1`] = `
 Object {
   "filename": "template.tokens.json",
   "line": 0,
@@ -18150,7 +18155,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/x-template\'",
+          "val": "'text/x-template'",
         },
       ],
       "block": Object {
@@ -18245,7 +18250,7 @@ Object {
           "line": 6,
           "mustEscape": true,
           "name": "type",
-          "val": "\'text/x-template\'",
+          "val": "'text/x-template'",
         },
       ],
       "block": Object {
@@ -18306,7 +18311,7 @@ Object {
 }
 `;
 
-exports[`test text.tokens.json 1`] = `
+exports[`text.tokens.json 1`] = `
 Object {
   "filename": "text.tokens.json",
   "line": 0,
@@ -18320,7 +18325,7 @@ Object {
           "line": 1,
           "mustEscape": true,
           "name": "value",
-          "val": "\'\'",
+          "val": "''",
         },
       ],
       "block": Object {
@@ -18861,7 +18866,7 @@ Object {
 }
 `;
 
-exports[`test text-block.tokens.json 1`] = `
+exports[`text-block.tokens.json 1`] = `
 Object {
   "filename": "text-block.tokens.json",
   "line": 0,
@@ -18889,7 +18894,7 @@ Object {
                 "line": 3,
                 "mustEscape": true,
                 "name": "type",
-                "val": "\'text\'",
+                "val": "'text'",
               },
               Object {
                 "column": 22,
@@ -18897,7 +18902,7 @@ Object {
                 "line": 3,
                 "mustEscape": true,
                 "name": "name",
-                "val": "\'user[name]\'",
+                "val": "'user[name]'",
               },
             ],
             "block": Object {
@@ -18948,7 +18953,7 @@ Object {
                 "line": 6,
                 "mustEscape": true,
                 "name": "type",
-                "val": "\'text\'",
+                "val": "'text'",
               },
               Object {
                 "column": 22,
@@ -18956,7 +18961,7 @@ Object {
                 "line": 6,
                 "mustEscape": true,
                 "name": "name",
-                "val": "\'user[pass]\'",
+                "val": "'user[pass]'",
               },
             ],
             "block": Object {
@@ -18989,7 +18994,7 @@ Object {
 }
 `;
 
-exports[`test utf8bom.tokens.json 1`] = `
+exports[`utf8bom.tokens.json 1`] = `
 Object {
   "filename": "utf8bom.tokens.json",
   "line": 0,
@@ -19006,7 +19011,7 @@ Object {
             "filename": "utf8bom.tokens.json",
             "line": 1,
             "type": "Text",
-            "val": "\"foo\"",
+            "val": "\\"foo\\"",
           },
         ],
         "type": "Block",
@@ -19024,7 +19029,7 @@ Object {
 }
 `;
 
-exports[`test vars.tokens.json 1`] = `
+exports[`vars.tokens.json 1`] = `
 Object {
   "filename": "vars.tokens.json",
   "line": 0,
@@ -19037,7 +19042,7 @@ Object {
       "line": 1,
       "mustEscape": false,
       "type": "Code",
-      "val": "var foo = \'bar\'",
+      "val": "var foo = 'bar'",
     },
     Object {
       "buffer": false,
@@ -19088,7 +19093,7 @@ Object {
 }
 `;
 
-exports[`test while.tokens.json 1`] = `
+exports[`while.tokens.json 1`] = `
 Object {
   "filename": "while.tokens.json",
   "line": 0,
@@ -19178,7 +19183,7 @@ Object {
 }
 `;
 
-exports[`test xml.tokens.json 1`] = `
+exports[`xml.tokens.json 1`] = `
 Object {
   "filename": "xml.tokens.json",
   "line": 0,
@@ -19199,7 +19204,7 @@ Object {
           "line": 2,
           "mustEscape": true,
           "name": "term",
-          "val": "\'some term\'",
+          "val": "'some term'",
         },
       ],
       "block": Object {
@@ -19246,7 +19251,7 @@ Object {
 }
 `;
 
-exports[`test yield.tokens.json 1`] = `
+exports[`yield.tokens.json 1`] = `
 Object {
   "filename": "yield.tokens.json",
   "line": 0,
@@ -19279,7 +19284,7 @@ Object {
                             "line": 4,
                             "mustEscape": true,
                             "name": "src",
-                            "val": "\'/caustic.js\'",
+                            "val": "'/caustic.js'",
                           },
                         ],
                         "block": Object {
@@ -19305,7 +19310,7 @@ Object {
                             "line": 5,
                             "mustEscape": true,
                             "name": "src",
-                            "val": "\'/app.js\'",
+                            "val": "'/app.js'",
                           },
                         ],
                         "block": Object {
@@ -19364,7 +19369,7 @@ Object {
 }
 `;
 
-exports[`test yield-before-conditional.tokens.json 1`] = `
+exports[`yield-before-conditional.tokens.json 1`] = `
 Object {
   "filename": "yield-before-conditional.tokens.json",
   "line": 0,
@@ -19397,7 +19402,7 @@ Object {
                             "line": 4,
                             "mustEscape": true,
                             "name": "src",
-                            "val": "\'/caustic.js\'",
+                            "val": "'/caustic.js'",
                           },
                         ],
                         "block": Object {
@@ -19423,7 +19428,7 @@ Object {
                             "line": 5,
                             "mustEscape": true,
                             "name": "src",
-                            "val": "\'/app.js\'",
+                            "val": "'/app.js'",
                           },
                         ],
                         "block": Object {
@@ -19482,7 +19487,7 @@ Object {
 }
 `;
 
-exports[`test yield-before-conditional-head.tokens.json 1`] = `
+exports[`yield-before-conditional-head.tokens.json 1`] = `
 Object {
   "filename": "yield-before-conditional-head.tokens.json",
   "line": 0,
@@ -19503,7 +19508,7 @@ Object {
                 "line": 2,
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'/jquery.js\'",
+                "val": "'/jquery.js'",
               },
             ],
             "block": Object {
@@ -19542,7 +19547,7 @@ Object {
                       "line": 5,
                       "mustEscape": true,
                       "name": "src",
-                      "val": "\'/jquery.ui.js\'",
+                      "val": "'/jquery.ui.js'",
                     },
                   ],
                   "block": Object {
@@ -19583,7 +19588,7 @@ Object {
 }
 `;
 
-exports[`test yield-head.tokens.json 1`] = `
+exports[`yield-head.tokens.json 1`] = `
 Object {
   "filename": "yield-head.tokens.json",
   "line": 0,
@@ -19604,7 +19609,7 @@ Object {
                 "line": 2,
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'/jquery.js\'",
+                "val": "'/jquery.js'",
               },
             ],
             "block": Object {
@@ -19636,7 +19641,7 @@ Object {
                 "line": 4,
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'/jquery.ui.js\'",
+                "val": "'/jquery.ui.js'",
               },
             ],
             "block": Object {
@@ -19669,7 +19674,7 @@ Object {
 }
 `;
 
-exports[`test yield-title.tokens.json 1`] = `
+exports[`yield-title.tokens.json 1`] = `
 Object {
   "filename": "yield-title.tokens.json",
   "line": 0,
@@ -19742,7 +19747,7 @@ Object {
 }
 `;
 
-exports[`test yield-title-head.tokens.json 1`] = `
+exports[`yield-title-head.tokens.json 1`] = `
 Object {
   "filename": "yield-title-head.tokens.json",
   "line": 0,
@@ -19787,7 +19792,7 @@ Object {
                 "line": 4,
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'/jquery.js\'",
+                "val": "'/jquery.js'",
               },
             ],
             "block": Object {
@@ -19813,7 +19818,7 @@ Object {
                 "line": 5,
                 "mustEscape": true,
                 "name": "src",
-                "val": "\'/jquery.ui.js\'",
+                "val": "'/jquery.ui.js'",
               },
             ],
             "block": Object {
diff --git a/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap b/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
index 7dd657623..0756b6a40 100644
--- a/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
+++ b/packages/pug-parser/test/__snapshots__/no-unnecessary-blocks.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test no uncessessary blocks should be added 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`no uncessessary blocks should be added 1`] = `
 Object {
   "line": 0,
   "nodes": Array [
diff --git a/packages/pug-strip-comments/test/__snapshots__/index.test.js.snap b/packages/pug-strip-comments/test/__snapshots__/index.test.js.snap
index 15f6103a6..7ee98d2eb 100644
--- a/packages/pug-strip-comments/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-strip-comments/test/__snapshots__/index.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test comment-in-comment.input.json 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`comment-in-comment.input.json 1`] = `
 Object {
   "code": "PUG:UNEXPECTED_TOKEN",
   "line": 2,
@@ -6,7 +8,7 @@ Object {
 }
 `;
 
-exports[`test comments.input.json 1`] = `
+exports[`comments.input.json 1`] = `
 Array [
   Object {
     "line": 2,
@@ -237,7 +239,7 @@ Array [
   Object {
     "line": 24,
     "type": "text",
-    "val": "script(src=\'/lame.js\')",
+    "val": "script(src='/lame.js')",
   },
   Object {
     "line": 25,
@@ -327,7 +329,7 @@ Array [
 ]
 `;
 
-exports[`test comments.input.json 2`] = `
+exports[`comments.input.json 2`] = `
 Array [
   Object {
     "line": 2,
@@ -503,7 +505,7 @@ Array [
 ]
 `;
 
-exports[`test comments.input.json 3`] = `
+exports[`comments.input.json 3`] = `
 Array [
   Object {
     "line": 2,
@@ -640,7 +642,7 @@ Array [
 ]
 `;
 
-exports[`test comments.source.input.json 1`] = `
+exports[`comments.source.input.json 1`] = `
 Array [
   Object {
     "line": 4,
@@ -657,7 +659,7 @@ Array [
 ]
 `;
 
-exports[`test comments.source.input.json 2`] = `
+exports[`comments.source.input.json 2`] = `
 Array [
   Object {
     "buffer": false,
@@ -750,7 +752,7 @@ Array [
 ]
 `;
 
-exports[`test comments.source.input.json 3`] = `
+exports[`comments.source.input.json 3`] = `
 Array [
   Object {
     "line": 4,
@@ -767,7 +769,7 @@ Array [
 ]
 `;
 
-exports[`test comments-in-case.input.json 1`] = `
+exports[`comments-in-case.input.json 1`] = `
 Array [
   Object {
     "line": 1,
@@ -805,7 +807,7 @@ Array [
     "escape": false,
     "line": 4,
     "type": "code",
-    "val": "var s = \'this\'",
+    "val": "var s = 'this'",
   },
   Object {
     "line": 5,
@@ -828,7 +830,7 @@ Array [
   Object {
     "line": 7,
     "type": "when",
-    "val": "\'this\'",
+    "val": "'this'",
   },
   Object {
     "line": 8,
@@ -844,7 +846,7 @@ Array [
   Object {
     "line": 8,
     "type": "text",
-    "val": "It\'s this!",
+    "val": "It's this!",
   },
   Object {
     "line": 9,
@@ -853,7 +855,7 @@ Array [
   Object {
     "line": 9,
     "type": "when",
-    "val": "\'that\'",
+    "val": "'that'",
   },
   Object {
     "line": 10,
@@ -869,7 +871,7 @@ Array [
   Object {
     "line": 10,
     "type": "text",
-    "val": "It\'s that!",
+    "val": "It's that!",
   },
   Object {
     "line": 10,
@@ -894,7 +896,7 @@ Array [
 ]
 `;
 
-exports[`test comments-in-case.input.json 2`] = `
+exports[`comments-in-case.input.json 2`] = `
 Array [
   Object {
     "line": 1,
@@ -932,7 +934,7 @@ Array [
     "escape": false,
     "line": 4,
     "type": "code",
-    "val": "var s = \'this\'",
+    "val": "var s = 'this'",
   },
   Object {
     "line": 5,
@@ -961,7 +963,7 @@ Array [
   Object {
     "line": 7,
     "type": "when",
-    "val": "\'this\'",
+    "val": "'this'",
   },
   Object {
     "line": 8,
@@ -977,7 +979,7 @@ Array [
   Object {
     "line": 8,
     "type": "text",
-    "val": "It\'s this!",
+    "val": "It's this!",
   },
   Object {
     "line": 9,
@@ -986,7 +988,7 @@ Array [
   Object {
     "line": 9,
     "type": "when",
-    "val": "\'that\'",
+    "val": "'that'",
   },
   Object {
     "line": 10,
@@ -1002,7 +1004,7 @@ Array [
   Object {
     "line": 10,
     "type": "text",
-    "val": "It\'s that!",
+    "val": "It's that!",
   },
   Object {
     "line": 10,
@@ -1027,7 +1029,7 @@ Array [
 ]
 `;
 
-exports[`test comments-in-case.input.json 3`] = `
+exports[`comments-in-case.input.json 3`] = `
 Array [
   Object {
     "line": 1,
@@ -1065,7 +1067,7 @@ Array [
     "escape": false,
     "line": 4,
     "type": "code",
-    "val": "var s = \'this\'",
+    "val": "var s = 'this'",
   },
   Object {
     "line": 5,
@@ -1088,7 +1090,7 @@ Array [
   Object {
     "line": 7,
     "type": "when",
-    "val": "\'this\'",
+    "val": "'this'",
   },
   Object {
     "line": 8,
@@ -1104,7 +1106,7 @@ Array [
   Object {
     "line": 8,
     "type": "text",
-    "val": "It\'s this!",
+    "val": "It's this!",
   },
   Object {
     "line": 9,
@@ -1113,7 +1115,7 @@ Array [
   Object {
     "line": 9,
     "type": "when",
-    "val": "\'that\'",
+    "val": "'that'",
   },
   Object {
     "line": 10,
@@ -1129,7 +1131,7 @@ Array [
   Object {
     "line": 10,
     "type": "text",
-    "val": "It\'s that!",
+    "val": "It's that!",
   },
   Object {
     "line": 10,
@@ -1154,7 +1156,7 @@ Array [
 ]
 `;
 
-exports[`test end.input.json 1`] = `
+exports[`end.input.json 1`] = `
 Object {
   "code": "PUG:UNEXPECTED_TOKEN",
   "line": 4,
@@ -1162,7 +1164,7 @@ Object {
 }
 `;
 
-exports[`test startstart.input.json 1`] = `
+exports[`startstart.input.json 1`] = `
 Object {
   "code": "PUG:UNEXPECTED_TOKEN",
   "line": 3,
diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
index 01f24328f..a27fe2cca 100644
--- a/packages/pug/test/__snapshots__/pug.test.js.snap
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -1,19 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false 1`] = `
-"var pug = require(\"pug-runtime\");
+"var pug = require(\\"pug-runtime\\");
 function template(locals) {
-  var pug_html = \"\",
+  var pug_html = \\"\\",
     pug_mixins = {},
     pug_interp;
   var pug_debug_filename, pug_debug_line;
   try {
     var self = locals || {};
     pug_debug_line = 1;
-    pug_html = pug_html + \'\\u003Cdiv class=\"bar\"\\u003E\';
+    pug_html = pug_html + '\\\\u003Cdiv class=\\"bar\\"\\\\u003E';
     pug_debug_line = 1;
     pug_html =
       pug_html +
-      pug.escape(null == (pug_interp = self.foo) ? \"\" : pug_interp) +
-      \"\\u003C\\u002Fdiv\\u003E\";
+      pug.escape(null == (pug_interp = self.foo) ? \\"\\" : pug_interp) +
+      \\"\\\\u003C\\\\u002Fdiv\\\\u003E\\";
   } catch (err) {
     pug.rethrow(err, pug_debug_filename, pug_debug_line);
   }
@@ -25,26 +27,26 @@ module.exports = template;
 
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true 1`] = `
 "function pug_escape(e) {
-  var a = \"\" + e,
+  var a = \\"\\" + e,
     t = pug_match_html.exec(a);
   if (!t) return e;
   var r,
     c,
     n,
-    s = \"\";
+    s = \\"\\";
   for (r = t.index, c = 0; r < a.length; r++) {
     switch (a.charCodeAt(r)) {
       case 34:
-        n = \"&quot;\";
+        n = \\"&quot;\\";
         break;
       case 38:
-        n = \"&amp;\";
+        n = \\"&amp;\\";
         break;
       case 60:
-        n = \"&lt;\";
+        n = \\"&lt;\\";
         break;
       case 62:
-        n = \"&gt;\";
+        n = \\"&gt;\\";
         break;
       default:
         continue;
@@ -53,45 +55,45 @@ exports[`pug .compileClient() should support module syntax in pug.compileClient(
   }
   return c !== r ? s + a.substring(c, r) : s;
 }
-var pug_match_html = /[\"&<>]/;
+var pug_match_html = /[\\"&<>]/;
 function pug_rethrow(n, e, r, t) {
   if (!(n instanceof Error)) throw n;
-  if (!((\"undefined\" == typeof window && e) || t))
-    throw ((n.message += \" on line \" + r), n);
+  if (!((\\"undefined\\" == typeof window && e) || t))
+    throw ((n.message += \\" on line \\" + r), n);
   try {
-    t = t || require(\"fs\").readFileSync(e, \"utf8\");
+    t = t || require(\\"fs\\").readFileSync(e, \\"utf8\\");
   } catch (e) {
     pug_rethrow(n, null, r);
   }
   var i = 3,
-    a = t.split(\"\\n\"),
+    a = t.split(\\"\\\\n\\"),
     o = Math.max(r - i, 0),
     h = Math.min(a.length, r + i),
     i = a
       .slice(o, h)
       .map(function(n, e) {
         var t = e + o + 1;
-        return (t == r ? \"  > \" : \"    \") + t + \"| \" + n;
+        return (t == r ? \\"  > \\" : \\"    \\") + t + \\"| \\" + n;
       })
-      .join(\"\\n\");
+      .join(\\"\\\\n\\");
   throw ((n.path = e),
-  (n.message = (e || \"Pug\") + \":\" + r + \"\\n\" + i + \"\\n\\n\" + n.message),
+  (n.message = (e || \\"Pug\\") + \\":\\" + r + \\"\\\\n\\" + i + \\"\\\\n\\\\n\\" + n.message),
   n);
 }
 function template(locals) {
-  var pug_html = \"\",
+  var pug_html = \\"\\",
     pug_mixins = {},
     pug_interp;
   var pug_debug_filename, pug_debug_line;
   try {
     var self = locals || {};
     pug_debug_line = 1;
-    pug_html = pug_html + \'\\u003Cdiv class=\"bar\"\\u003E\';
+    pug_html = pug_html + '\\\\u003Cdiv class=\\"bar\\"\\\\u003E';
     pug_debug_line = 1;
     pug_html =
       pug_html +
-      pug_escape(null == (pug_interp = self.foo) ? \"\" : pug_interp) +
-      \"\\u003C\\u002Fdiv\\u003E\";
+      pug_escape(null == (pug_interp = self.foo) ? \\"\\" : pug_interp) +
+      \\"\\\\u003C\\\\u002Fdiv\\\\u003E\\";
   } catch (err) {
     pug_rethrow(err, pug_debug_filename, pug_debug_line);
   }
diff --git a/packages/pug/test/duplicate-block/__snapshots__/index.test.js.snap b/packages/pug/test/duplicate-block/__snapshots__/index.test.js.snap
index 3939e1e73..b86122221 100644
--- a/packages/pug/test/duplicate-block/__snapshots__/index.test.js.snap
+++ b/packages/pug/test/duplicate-block/__snapshots__/index.test.js.snap
@@ -1,3 +1,5 @@
-exports[`test layout with duplicate block 1`] = `"<div>Hello World</div>"`;
+// Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`test layout with duplicate block 2`] = `"<!DOCTYPE html><html><head></head><body><div>Hello World</div></body></html>"`;
+exports[`layout with duplicate block 1`] = `"<div>Hello World</div>"`;
+
+exports[`layout with duplicate block 2`] = `"<!DOCTYPE html><html><head></head><body><div>Hello World</div></body></html>"`;
diff --git a/packages/pug/test/regression-2436/__snapshots__/index.test.js.snap b/packages/pug/test/regression-2436/__snapshots__/index.test.js.snap
index 552bcdcdc..142ec675a 100644
--- a/packages/pug/test/regression-2436/__snapshots__/index.test.js.snap
+++ b/packages/pug/test/regression-2436/__snapshots__/index.test.js.snap
@@ -1,4 +1,6 @@
-exports[`test #2436 - block with a same name extends from different layout in nesting 1`] = `
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`#2436 - block with a same name extends from different layout in nesting 1`] = `
 "
 <h1>layout </h1>
 <p>Main A</p>
@@ -6,7 +8,7 @@ exports[`test #2436 - block with a same name extends from different layout in ne
 <p>Other A</p>"
 `;
 
-exports[`test #2436 - block with a same name extends from the same layout in nesting 1`] = `
+exports[`#2436 - block with a same name extends from the same layout in nesting 1`] = `
 "
 <h1>layout </h1>
 <p>Main A</p>
diff --git a/packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap b/packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap
index c1446e484..43a917e82 100644
--- a/packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap
+++ b/packages/pug/test/shadowed-block/__snapshots__/index.test.js.snap
@@ -1,3 +1,5 @@
-exports[`test layout with shadowed block 1`] = `"<!-- layout.pug: root--><!-- index.pug: shadowed-->"`;
+// Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`test layout with shadowed block 2`] = `"<!-- layout.pug: root--><!-- index.pug: shadowed-->"`;
+exports[`layout with shadowed block 1`] = `"<!-- layout.pug: root--><!-- index.pug: shadowed-->"`;
+
+exports[`layout with shadowed block 2`] = `"<!-- layout.pug: root--><!-- index.pug: shadowed-->"`;
diff --git a/yarn.lock b/yarn.lock
index 3f257afd8..01a516311 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,673 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/core@^7.1.0":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.2.2"
+    "@babel/helpers" "^7.2.0"
+    "@babel/parser" "^7.2.2"
+    "@babel/template" "^7.2.2"
+    "@babel/traverse" "^7.2.2"
+    "@babel/types" "^7.2.2"
+    convert-source-map "^1.1.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.10"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.0.0", "@babel/generator@^7.2.2":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.0.tgz#f663838cd7b542366de3aa608a657b8ccb2a99eb"
+  dependencies:
+    "@babel/types" "^7.3.0"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-get-function-arity@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-plugin-utils@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+
+"@babel/helper-split-export-declaration@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helpers@^7.2.0":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
+  dependencies:
+    "@babel/template" "^7.1.2"
+    "@babel/traverse" "^7.1.5"
+    "@babel/types" "^7.3.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181"
+
+"@babel/plugin-syntax-object-rest-spread@^7.0.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.2.2"
+    "@babel/types" "^7.2.2"
+
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.2.2"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/parser" "^7.2.3"
+    "@babel/types" "^7.2.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
+"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0":
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
+
+"@lerna/add@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.10.6.tgz#6f2c6b26eb905c40fef4180f3ffa34ad9dbb860b"
+  dependencies:
+    "@lerna/bootstrap" "3.10.6"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/npm-conf" "3.7.0"
+    "@lerna/validation-error" "3.6.0"
+    dedent "^0.7.0"
+    libnpm "^2.0.1"
+    p-map "^1.2.0"
+    semver "^5.5.0"
+
+"@lerna/batch-packages@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.10.6.tgz#2d6dfc9be13ea4da49244dd84bfcd46c3d62f4d0"
+  dependencies:
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
+
+"@lerna/bootstrap@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.10.6.tgz#d250baa9cfe9026c4f78e6cf7c9761a90b24e363"
+  dependencies:
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/has-npm-version" "3.10.0"
+    "@lerna/npm-install" "3.10.0"
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/rimraf-dir" "3.10.0"
+    "@lerna/run-lifecycle" "3.10.5"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/symlink-binary" "3.10.0"
+    "@lerna/symlink-dependencies" "3.10.0"
+    "@lerna/validation-error" "3.6.0"
+    dedent "^0.7.0"
+    get-port "^3.2.0"
+    libnpm "^2.0.1"
+    multimatch "^2.1.0"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+    read-package-tree "^5.1.6"
+    semver "^5.5.0"
+
+"@lerna/changed@3.10.8":
+  version "3.10.8"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.10.8.tgz#7ed17a00c4ca0f6437ce9f7d4925d5e779b8553c"
+  dependencies:
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/command" "3.10.6"
+    "@lerna/listable" "3.10.6"
+    "@lerna/output" "3.6.0"
+    "@lerna/version" "3.10.8"
+
+"@lerna/check-working-tree@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.10.0.tgz#5ed9f2c5c942bee92afcd8cb5361be44ed0251e3"
+  dependencies:
+    "@lerna/describe-ref" "3.10.0"
+    "@lerna/validation-error" "3.6.0"
+
+"@lerna/child-process@3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f"
+  dependencies:
+    chalk "^2.3.1"
+    execa "^1.0.0"
+    strong-log-transformer "^2.0.0"
+
+"@lerna/clean@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.10.6.tgz#31e4a12a722e57ca7adc0c9bc30ba70d55572bb8"
+  dependencies:
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/rimraf-dir" "3.10.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+
+"@lerna/cli@3.10.7":
+  version "3.10.7"
+  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.10.7.tgz#2f88ae4a3c53fa4d3a4f61b5f447bbbcc69546e2"
+  dependencies:
+    "@lerna/global-options" "3.10.6"
+    dedent "^0.7.0"
+    libnpm "^2.0.1"
+    yargs "^12.0.1"
+
+"@lerna/collect-updates@3.10.1":
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.10.1.tgz#3ad60aa31826c0c0cfdf8bf41e58e6c5c86aeb3a"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/describe-ref" "3.10.0"
+    libnpm "^2.0.1"
+    minimatch "^3.0.4"
+    slash "^1.0.0"
+
+"@lerna/command@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.10.6.tgz#709bd1c66220da67f65dbe1fc88bb7ba5bb85446"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/project" "3.10.0"
+    "@lerna/validation-error" "3.6.0"
+    "@lerna/write-log-file" "3.6.0"
+    dedent "^0.7.0"
+    execa "^1.0.0"
+    is-ci "^1.0.10"
+    libnpm "^2.0.1"
+    lodash "^4.17.5"
+
+"@lerna/conventional-commits@3.10.8":
+  version "3.10.8"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.10.8.tgz#b9f6dd8a09bc679f6afbb8296456de59e268fe3e"
+  dependencies:
+    "@lerna/validation-error" "3.6.0"
+    conventional-changelog-angular "^5.0.2"
+    conventional-changelog-core "^3.1.5"
+    conventional-recommended-bump "^4.0.4"
+    fs-extra "^7.0.0"
+    get-stream "^4.0.0"
+    libnpm "^2.0.1"
+    pify "^3.0.0"
+    semver "^5.5.0"
+
+"@lerna/create-symlink@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.6.0.tgz#f1815cde2fc9d8d2315dfea44ee880f2f1bc65f1"
+  dependencies:
+    cmd-shim "^2.0.2"
+    fs-extra "^7.0.0"
+    libnpm "^2.0.1"
+
+"@lerna/create@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.10.6.tgz#85c7398cad912516c0ac6054a5c0c4145ab6cadb"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/npm-conf" "3.7.0"
+    "@lerna/validation-error" "3.6.0"
+    camelcase "^4.1.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    globby "^8.0.1"
+    init-package-json "^1.10.3"
+    libnpm "^2.0.1"
+    p-reduce "^1.0.0"
+    pify "^3.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    validate-npm-package-license "^3.0.3"
+    validate-npm-package-name "^3.0.0"
+    whatwg-url "^7.0.0"
+
+"@lerna/describe-ref@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.10.0.tgz#266380feece6013ab9674f52bd35bf0be5b0460d"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    libnpm "^2.0.1"
+
+"@lerna/diff@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.10.6.tgz#b4c5a50d8c7e79619376e2c913ec1c627dfd0cdf"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
+
+"@lerna/exec@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.10.6.tgz#5564b614b7e39c1f034f5e0736c9e020945f2f12"
+  dependencies:
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/validation-error" "3.6.0"
+
+"@lerna/filter-options@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.10.6.tgz#e05a8b8de6efc16c47c83f0ac58291008efba4b8"
+  dependencies:
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/filter-packages" "3.10.0"
+    dedent "^0.7.0"
+
+"@lerna/filter-packages@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.10.0.tgz#75f9a08184fc4046da2057e0218253cd6f493f05"
+  dependencies:
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
+    multimatch "^2.1.0"
+
+"@lerna/get-npm-exec-opts@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.6.0.tgz#ea595eb28d1f34ba61a92ee8391f374282b4b76e"
+  dependencies:
+    libnpm "^2.0.1"
+
+"@lerna/get-packed@3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.7.0.tgz#549c7738f7be5e3b1433e82ed9cda9123bcd1ed5"
+  dependencies:
+    fs-extra "^7.0.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+
+"@lerna/global-options@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.10.6.tgz#c491a64b0be47eca4ffc875011958a5ee70a9a3e"
+
+"@lerna/has-npm-version@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.10.0.tgz#d3a73c0fedd2f2e9c6fbe166c41809131dc939d2"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    semver "^5.5.0"
+
+"@lerna/import@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.10.6.tgz#36b65854857e8ab5dfd98a1caea4d365ecc06578"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/validation-error" "3.6.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    p-map-series "^1.0.0"
+
+"@lerna/init@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.10.6.tgz#b5c5166b2ddf00ea0f2742a1f53f59221478cf9a"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/command" "3.10.6"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+    write-json-file "^2.3.0"
+
+"@lerna/link@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.10.6.tgz#4201cabbfc27bebaf1a400f8cfbd238f285dd3c7"
+  dependencies:
+    "@lerna/command" "3.10.6"
+    "@lerna/package-graph" "3.10.6"
+    "@lerna/symlink-dependencies" "3.10.0"
+    p-map "^1.2.0"
+    slash "^1.0.0"
+
+"@lerna/list@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.10.6.tgz#7c43c09301ea01528f4dab3b22666f021e8ba9a5"
+  dependencies:
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/listable" "3.10.6"
+    "@lerna/output" "3.6.0"
+
+"@lerna/listable@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.10.6.tgz#cea92de89d9f293c6d63e00be662bed03f85c496"
+  dependencies:
+    "@lerna/batch-packages" "3.10.6"
+    chalk "^2.3.1"
+    columnify "^1.5.4"
+
+"@lerna/log-packed@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.6.0.tgz#bed96c2bdd47f076d9957d0c6069b2edc1518145"
+  dependencies:
+    byte-size "^4.0.3"
+    columnify "^1.5.4"
+    has-unicode "^2.0.1"
+    libnpm "^2.0.1"
+
+"@lerna/npm-conf@3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.7.0.tgz#f101d4fdf07cefcf1161bcfaf3c0f105b420a450"
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
+
+"@lerna/npm-dist-tag@3.8.5":
+  version "3.8.5"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.8.5.tgz#5ce22a72576badc8cb6baf85550043d63e66ea44"
+  dependencies:
+    figgy-pudding "^3.5.1"
+    libnpm "^2.0.1"
+
+"@lerna/npm-install@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.10.0.tgz#fcd6688a3a2cd0e702a03c54c22eb7ae8b3dacb0"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/get-npm-exec-opts" "3.6.0"
+    fs-extra "^7.0.0"
+    libnpm "^2.0.1"
+    signal-exit "^3.0.2"
+    write-pkg "^3.1.0"
+
+"@lerna/npm-publish@3.10.7":
+  version "3.10.7"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.10.7.tgz#9326b747b905a7f0e69d4be3f557859c3e359649"
+  dependencies:
+    "@lerna/run-lifecycle" "3.10.5"
+    figgy-pudding "^3.5.1"
+    fs-extra "^7.0.0"
+    libnpm "^2.0.1"
+
+"@lerna/npm-run-script@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.10.0.tgz#49a9204eddea136da15a8d8d9eba2c3175b77ddd"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    "@lerna/get-npm-exec-opts" "3.6.0"
+    libnpm "^2.0.1"
+
+"@lerna/output@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.6.0.tgz#a69384bc685cf3b21aa1bfc697eb2b9db3333d0b"
+  dependencies:
+    libnpm "^2.0.1"
+
+"@lerna/pack-directory@3.10.5":
+  version "3.10.5"
+  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.10.5.tgz#9bdabceacb74e1f54e47bae925e193978f2aae51"
+  dependencies:
+    "@lerna/get-packed" "3.7.0"
+    "@lerna/package" "3.7.2"
+    "@lerna/run-lifecycle" "3.10.5"
+    figgy-pudding "^3.5.1"
+    libnpm "^2.0.1"
+    npm-packlist "^1.1.12"
+    tar "^4.4.8"
+    temp-write "^3.4.0"
+
+"@lerna/package-graph@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.10.6.tgz#8940d1ed7003100117cb1b618f7690585c00db81"
+  dependencies:
+    "@lerna/validation-error" "3.6.0"
+    libnpm "^2.0.1"
+    semver "^5.5.0"
+
+"@lerna/package@3.7.2":
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.7.2.tgz#03c69fd7fb965c372c8c969165a2f7d6dfe2dfcb"
+  dependencies:
+    libnpm "^2.0.1"
+    load-json-file "^4.0.0"
+    write-pkg "^3.1.0"
+
+"@lerna/project@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.10.0.tgz#98272bf2eb93e9b21850edae568d696bf7fdebda"
+  dependencies:
+    "@lerna/package" "3.7.2"
+    "@lerna/validation-error" "3.6.0"
+    cosmiconfig "^5.0.2"
+    dedent "^0.7.0"
+    dot-prop "^4.2.0"
+    glob-parent "^3.1.0"
+    globby "^8.0.1"
+    libnpm "^2.0.1"
+    load-json-file "^4.0.0"
+    p-map "^1.2.0"
+    resolve-from "^4.0.0"
+    write-json-file "^2.3.0"
+
+"@lerna/prompt@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.6.0.tgz#b17cc464dec9d830619723e879dc747367378217"
+  dependencies:
+    inquirer "^6.2.0"
+    libnpm "^2.0.1"
+
+"@lerna/publish@3.10.8":
+  version "3.10.8"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.10.8.tgz#fcf73ab2468807f5a8f3339234c2f66f0f65b088"
+  dependencies:
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/check-working-tree" "3.10.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/command" "3.10.6"
+    "@lerna/describe-ref" "3.10.0"
+    "@lerna/log-packed" "3.6.0"
+    "@lerna/npm-conf" "3.7.0"
+    "@lerna/npm-dist-tag" "3.8.5"
+    "@lerna/npm-publish" "3.10.7"
+    "@lerna/output" "3.6.0"
+    "@lerna/pack-directory" "3.10.5"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/pulse-till-done" "3.7.1"
+    "@lerna/run-lifecycle" "3.10.5"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/validation-error" "3.6.0"
+    "@lerna/version" "3.10.8"
+    figgy-pudding "^3.5.1"
+    fs-extra "^7.0.0"
+    libnpm "^2.0.1"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
+    semver "^5.5.0"
+
+"@lerna/pulse-till-done@3.7.1":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.7.1.tgz#a9e55380fa18f6896a3e5b23621a4227adfb8f85"
+  dependencies:
+    libnpm "^2.0.1"
+
+"@lerna/resolve-symlink@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.6.0.tgz#985344796b704ff32afa923901e795e80741b86e"
+  dependencies:
+    fs-extra "^7.0.0"
+    libnpm "^2.0.1"
+    read-cmd-shim "^1.0.1"
+
+"@lerna/rimraf-dir@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.10.0.tgz#2d9435054ab7bbc5519db0a2654c5d8cacd27f98"
+  dependencies:
+    "@lerna/child-process" "3.3.0"
+    libnpm "^2.0.1"
+    path-exists "^3.0.0"
+    rimraf "^2.6.2"
+
+"@lerna/run-lifecycle@3.10.5":
+  version "3.10.5"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.10.5.tgz#ea4422bb70c0f8d4382ecb2a626c8ba0ca88550b"
+  dependencies:
+    "@lerna/npm-conf" "3.7.0"
+    figgy-pudding "^3.5.1"
+    libnpm "^2.0.1"
+
+"@lerna/run-parallel-batches@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840"
+  dependencies:
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/run@3.10.6":
+  version "3.10.6"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.10.6.tgz#4c159a719b0ec010409dfe8f9535c9a3c3f3e06a"
+  dependencies:
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/command" "3.10.6"
+    "@lerna/filter-options" "3.10.6"
+    "@lerna/npm-run-script" "3.10.0"
+    "@lerna/output" "3.6.0"
+    "@lerna/run-parallel-batches" "3.0.0"
+    "@lerna/timer" "3.5.0"
+    "@lerna/validation-error" "3.6.0"
+    p-map "^1.2.0"
+
+"@lerna/symlink-binary@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.10.0.tgz#5acdde86dfd50c9270d7d2a93bade203cff41b3d"
+  dependencies:
+    "@lerna/create-symlink" "3.6.0"
+    "@lerna/package" "3.7.2"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+
+"@lerna/symlink-dependencies@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.10.0.tgz#a20226e8e97af6a6bc4b416bfc28c0c5e3ba9ddd"
+  dependencies:
+    "@lerna/create-symlink" "3.6.0"
+    "@lerna/resolve-symlink" "3.6.0"
+    "@lerna/symlink-binary" "3.10.0"
+    fs-extra "^7.0.0"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/timer@3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.5.0.tgz#8dee6acf002c55de64678c66ef37ca52143f1b9b"
+
+"@lerna/validation-error@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.6.0.tgz#550cf66bb2ef88edc02e36017b575a7a9100d5d8"
+  dependencies:
+    libnpm "^2.0.1"
+
+"@lerna/version@3.10.8":
+  version "3.10.8"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.10.8.tgz#14a645724b0369f84a0bf4c1eb093e8e96a219f1"
+  dependencies:
+    "@lerna/batch-packages" "3.10.6"
+    "@lerna/check-working-tree" "3.10.0"
+    "@lerna/child-process" "3.3.0"
+    "@lerna/collect-updates" "3.10.1"
+    "@lerna/command" "3.10.6"
+    "@lerna/conventional-commits" "3.10.8"
+    "@lerna/output" "3.6.0"
+    "@lerna/prompt" "3.6.0"
+    "@lerna/run-lifecycle" "3.10.5"
+    "@lerna/validation-error" "3.6.0"
+    chalk "^2.3.1"
+    dedent "^0.7.0"
+    libnpm "^2.0.1"
+    minimatch "^3.0.4"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
+    p-waterfall "^1.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    temp-write "^3.4.0"
+
+"@lerna/write-log-file@3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.6.0.tgz#b8d5a7efc84fa93cbd67d724d11120343b2a849a"
+  dependencies:
+    libnpm "^2.0.1"
+    write-file-atomic "^2.3.0"
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+
 "@types/babel-types@*", "@types/babel-types@^7.0.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.1.tgz#1405e5396968c4302994b0161ce405b72b874257"
@@ -19,16 +686,38 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abab@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
+abab@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
 
-acorn-globals@^3.0.0, acorn-globals@^3.1.0:
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+acorn-globals@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
   dependencies:
     acorn "^4.0.4"
 
+acorn-globals@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
+acorn-walk@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
+
 acorn@^3.0.4, acorn@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -37,9 +726,25 @@ acorn@^4.0.4, acorn@~4.0.2:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-add-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
+acorn@^5.5.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+
+acorn@^6.0.1:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.6.tgz#cd75181670d5b99bdb1b1c993941d3a239ab1f56"
+
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agentkeepalive@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  dependencies:
+    humanize-ms "^1.2.1"
 
 ajv@^4.9.1:
   version "4.11.8"
@@ -48,14 +753,14 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+ajv@^6.5.5:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
   dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
+    fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -69,13 +774,9 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-ansi-escapes@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-
-ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -85,30 +786,37 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+ansi-regex@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
 
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
     color-convert "^1.9.0"
 
-ansicolors@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
 
-append-transform@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+append-transform@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
   dependencies:
-    default-require-extensions "^1.0.0"
+    default-require-extensions "^2.0.0"
 
-aproba@^1.0.3:
+aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
+"aproba@^1.1.2 || 2", aproba@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+
 are-we-there-yet@~1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
@@ -122,16 +830,22 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
 
-arr-flatten@^1.0.1:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+
+array-differ@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -154,22 +868,22 @@ array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
-arrify@^1.0.1:
+arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
+asap@^2.0.0, asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
 asap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
 
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -182,15 +896,27 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-async@^1.4.0, async@^1.5.0:
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+
+async-limiter@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+
+async@^1.4.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+async@^2.5.0, async@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
-    lodash "^4.14.0"
+    lodash "^4.17.10"
 
 async@~0.2.6:
   version "0.2.10"
@@ -200,6 +926,10 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -208,139 +938,48 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.2.1, aws4@^1.6.0:
+aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@^6.0.0, babel-core@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.7"
-    slash "^1.0.0"
-    source-map "^0.5.6"
-
-babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+babel-jest@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.0.0.tgz#8a0c767f03f4a595fb921afdab13ff126edd00da"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
+    babel-plugin-istanbul "^5.1.0"
+    babel-preset-jest "^24.0.0"
 
-babel-jest@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-18.0.0.tgz#17ebba8cb3285c906d859e8707e4e79795fb65e3"
-  dependencies:
-    babel-core "^6.0.0"
-    babel-plugin-istanbul "^3.0.0"
-    babel-preset-jest "^18.0.0"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-istanbul@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-3.1.2.tgz#11d5abde18425ec24b5d648c7e0b5d25cd354a22"
+babel-plugin-istanbul@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.1.tgz#7981590f1956d75d67630ba46f0c22493588c893"
   dependencies:
-    find-up "^1.1.2"
-    istanbul-lib-instrument "^1.4.2"
-    object-assign "^4.1.0"
-    test-exclude "^3.3.0"
+    find-up "^3.0.0"
+    istanbul-lib-instrument "^3.0.0"
+    test-exclude "^5.0.0"
 
-babel-plugin-jest-hoist@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-18.0.0.tgz#4150e70ecab560e6e7344adc849498072d34e12a"
+babel-plugin-jest-hoist@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.0.0.tgz#3adf030b6fd67e4311479a54b24077bdfc226ec9"
 
-babel-preset-jest@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-18.0.0.tgz#84faf8ca3ec65aba7d5e3f59bbaed935ab24049e"
+babel-preset-jest@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.0.0.tgz#d23782e5e036cff517859640a80960bd628bd82b"
   dependencies:
-    babel-plugin-jest-hoist "^18.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    babel-plugin-jest-hoist "^24.0.0"
 
-babel-register@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  dependencies:
-    babel-core "^6.26.0"
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.17.4"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.15"
-
-babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.18.0, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.18.0, babel-types@^6.26.0:
+babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   dependencies:
@@ -363,36 +1002,50 @@ barrage@^1.1.0:
   dependencies:
     promise "^6.0.0"
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
   dependencies:
     tweetnacl "^0.14.3"
 
+bin-links@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757"
+  dependencies:
+    bluebird "^3.5.0"
+    cmd-shim "^2.0.2"
+    gentle-fs "^2.0.0"
+    graceful-fs "^4.1.11"
+    write-file-atomic "^2.3.0"
+
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
   dependencies:
     inherits "~2.0.0"
 
+bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
   dependencies:
     hoek "2.x.x"
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -400,38 +1053,114 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
     repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
 
-browser-resolve@^1.11.2:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+browser-process-hrtime@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+
+browser-resolve@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
   dependencies:
     resolve "1.1.7"
 
-bser@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
+bser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
   dependencies:
     node-int64 "^0.4.0"
 
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
 
+byte-size@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.4.tgz#29d381709f41aae0d89c631f1c81aec88cd40b23"
+
+cacache@^11.0.1, cacache@^11.3.2:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+  dependencies:
+    bluebird "^3.5.3"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  dependencies:
+    caller-callsite "^2.0.0"
+
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
 
+callsites@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
+
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -455,28 +1184,19 @@ camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
-capture-stack-trace@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+camelcase@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
 
-cardinal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
   dependencies:
-    ansicolors "~0.2.1"
-    redeyed "~1.0.0"
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+    rsvp "^3.3.3"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -489,19 +1209,9 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.1.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -513,20 +1223,36 @@ character-parser@^2.1.1:
   dependencies:
     is-regex "^1.0.3"
 
-chardet@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+
+chownr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
 
 ci-info@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
-clean-css@^3.3.0:
-  version "3.4.28"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
   dependencies:
-    commander "2.8.x"
-    source-map "0.4.x"
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-css@^4.1.11:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  dependencies:
+    source-map "~0.6.0"
 
 cli-cursor@^2.1.0:
   version "2.1.0"
@@ -534,19 +1260,6 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
-  dependencies:
-    colors "1.0.3"
-
-cli-usage@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/cli-usage/-/cli-usage-0.1.7.tgz#eaf1c9d5b91e22482333072a12127f05cd99a3ba"
-  dependencies:
-    marked "^0.3.12"
-    marked-terminal "^2.0.0"
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -559,12 +1272,12 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
   dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
 clone@^1.0.2:
@@ -594,6 +1307,13 @@ coffee-script@~1.12.7:
   version "1.12.7"
   resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
 color-convert@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
@@ -604,10 +1324,6 @@ color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
-colors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-
 columnify@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
@@ -615,25 +1331,21 @@ columnify@^1.5.4:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
+combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
-command-join@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
-
-commander@2.8.x:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   dependencies:
-    graceful-readlink ">= 1.0.0"
+    delayed-stream "~1.0.0"
 
-commander@^2.9.0:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
 
 compare-func@^1.3.1:
   version "1.3.2"
@@ -642,15 +1354,19 @@ compare-func@^1.3.1:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
 
-compare-versions@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
+compare-versions@^3.2.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.4.10, concat-stream@^1.4.6, concat-stream@^1.4.7:
+concat-stream@^1.4.6, concat-stream@^1.4.7:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
   dependencies:
@@ -658,6 +1374,22 @@ concat-stream@^1.4.10, concat-stream@^1.4.6, concat-stream@^1.4.7:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^1.5.0, concat-stream@^1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+config-chain@^1.1.11:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -671,104 +1403,41 @@ constantinople@^3.0.1:
     babel-types "^6.26.0"
     babylon "^6.18.0"
 
-content-type-parser@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
-
-conventional-changelog-angular@^1.6.6:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+conventional-changelog-angular@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a"
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-atom@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz#4917759947f4db86073f9d3838a2d54302d5843d"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-cli@^1.3.13:
-  version "1.3.16"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.16.tgz#69acdcc4b68b4d123c5945868dffe394960cea9d"
-  dependencies:
-    add-stream "^1.0.0"
-    conventional-changelog "^1.1.18"
-    lodash "^4.2.1"
-    meow "^4.0.0"
-    tempfile "^1.1.1"
-
-conventional-changelog-codemirror@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz#debc43991d487d7964e65087fbbe034044bd51fb"
+conventional-changelog-core@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c"
   dependencies:
-    q "^1.5.1"
-
-conventional-changelog-core@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz#45b6347c4c6512e1f163f7ff55c9f5bcb88fd990"
-  dependencies:
-    conventional-changelog-writer "^3.0.4"
-    conventional-commits-parser "^2.1.5"
+    conventional-changelog-writer "^4.0.2"
+    conventional-commits-parser "^3.0.1"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.3.4"
+    git-raw-commits "2.0.0"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.3.4"
+    git-semver-tags "^2.0.2"
     lodash "^4.2.1"
     normalize-package-data "^2.3.5"
     q "^1.5.1"
-    read-pkg "^1.1.0"
-    read-pkg-up "^1.0.1"
+    read-pkg "^3.0.0"
+    read-pkg-up "^3.0.0"
     through2 "^2.0.0"
 
-conventional-changelog-ember@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz#f3825d7434168f3d9211b5532dc1d5769532b668"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-eslint@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz#8bae05ebbf574e6506caf7b37dc51ca21b74d220"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-express@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz#812a9cf778677e12f978ac9c40d85297c0bfcca9"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-jquery@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jscs@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jshint@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz#b2de33cd0870d9af804ac6a4fded0ee25b69c9bb"
-  dependencies:
-    compare-func "^1.3.1"
-    q "^1.5.1"
-
-conventional-changelog-preset-loader@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz#b29af6332f9313857be36427623c9016bfeeaf33"
+conventional-changelog-preset-loader@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
 
-conventional-changelog-writer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz#705b46a8b8277bd7fd79cad8032095b5d803864c"
+conventional-changelog-writer@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.2.tgz#eb493ed84269e7a663da36e49af51c54639c9a67"
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^1.1.5"
+    conventional-commits-filter "^2.0.1"
     dateformat "^3.0.0"
     handlebars "^4.0.2"
     json-stringify-safe "^5.0.1"
@@ -778,32 +1447,16 @@ conventional-changelog-writer@^3.0.4:
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-changelog@^1.1.18:
-  version "1.1.18"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.18.tgz#ffe28798e4ddef5f6e2f74398e8248bcb233360b"
-  dependencies:
-    conventional-changelog-angular "^1.6.6"
-    conventional-changelog-atom "^0.2.4"
-    conventional-changelog-codemirror "^0.3.4"
-    conventional-changelog-core "^2.0.5"
-    conventional-changelog-ember "^0.3.6"
-    conventional-changelog-eslint "^1.0.5"
-    conventional-changelog-express "^0.3.4"
-    conventional-changelog-jquery "^0.1.0"
-    conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.3.4"
-    conventional-changelog-preset-loader "^1.1.6"
-
-conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz#77aac065e3de9c1a74b801e8e25c9affb3184f65"
+conventional-commits-filter@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz#9ac3a4ab221c0c3c9e9dd2c09ae01e6d1e1dabe0"
+conventional-commits-parser@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -813,23 +1466,41 @@ conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.5:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-recommended-bump@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz#1b7137efb5091f99fe009e2fe9ddb7cc490e9375"
+conventional-recommended-bump@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
   dependencies:
-    concat-stream "^1.4.10"
-    conventional-commits-filter "^1.1.1"
-    conventional-commits-parser "^2.1.1"
-    git-raw-commits "^1.3.0"
-    git-semver-tags "^1.3.0"
-    meow "^3.3.0"
-    object-assign "^4.0.1"
+    concat-stream "^1.6.0"
+    conventional-changelog-preset-loader "^2.0.2"
+    conventional-commits-filter "^2.0.1"
+    conventional-commits-parser "^3.0.1"
+    git-raw-commits "2.0.0"
+    git-semver-tags "^2.0.2"
+    meow "^4.0.0"
+    q "^1.5.1"
 
-convert-source-map@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+convert-source-map@^1.1.0, convert-source-map@^1.4.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  dependencies:
+    safe-buffer "~5.1.1"
 
-core-js@^2.4.0, core-js@^2.5.0:
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
+core-js@^2.4.0:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
 
@@ -837,27 +1508,33 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-coveralls@^2.11.2:
-  version "2.13.3"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.3.tgz#9ad7c2ae527417f361e8b626483f48ee92dd2bc7"
+cosmiconfig@^5.0.2:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
   dependencies:
-    js-yaml "3.6.1"
-    lcov-parse "0.0.10"
-    log-driver "1.2.5"
-    minimist "1.2.0"
-    request "2.79.0"
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
 
-create-error-class@^3.0.0:
+coveralls@3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.2.tgz#f5a0bcd90ca4e64e088b710fa8dda640aea4884f"
   dependencies:
-    capture-stack-trace "^1.0.0"
+    growl "~> 1.10.0"
+    js-yaml "^3.11.0"
+    lcov-parse "^0.0.10"
+    log-driver "^1.2.7"
+    minimist "^1.2.0"
+    request "^2.85.0"
 
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
-    lru-cache "^4.0.1"
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
     shebang-command "^1.2.0"
     which "^1.2.9"
 
@@ -867,12 +1544,6 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
 css-parse@1.7.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
@@ -881,9 +1552,9 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
-"cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+cssstyle@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
   dependencies:
     cssom "0.3.x"
 
@@ -893,6 +1564,10 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -905,22 +1580,40 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@*, debug@^3.1.0:
+debug@*, debug@3.1.0, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
     ms "2.0.0"
 
-debug@^2.6.8:
+debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
+debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  dependencies:
+    ms "^2.1.1"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -928,27 +1621,31 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
 
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
-default-require-extensions@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+default-require-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
   dependencies:
-    strip-bom "^2.0.0"
+    strip-bom "^3.0.0"
 
 defaults@^1.0.3:
   version "1.0.3"
@@ -956,6 +1653,31 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+define-properties@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -964,49 +1686,98 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
 detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
 
-diff@^3.0.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
+detect-newline@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+diff-sequences@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.0.0.tgz#cdf8e27ed20d8b8d3caccb4e0c0d8fe31a173013"
+
+dir-glob@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
 
 doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
 
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  dependencies:
+    webidl-conversions "^4.0.2"
+
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
   dependencies:
     is-obj "^1.0.0"
 
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+dot-prop@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  dependencies:
+    is-obj "^1.0.0"
 
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
   dependencies:
     jsbn "~0.1.0"
 
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  dependencies:
+    iconv-lite "~0.4.13"
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  dependencies:
+    once "^1.4.0"
+
 entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-errno@^0.1.1, errno@~0.1.7:
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+
+errno@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   dependencies:
@@ -1018,13 +1789,42 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+es-abstract@^1.5.1:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-keys "^1.0.12"
+
+es-to-primitive@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es6-promise@^4.0.3:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  dependencies:
+    es6-promise "^4.0.3"
+
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@^1.6.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+escodegen@^1.9.1:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -1033,10 +1833,6 @@ escodegen@^1.6.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-esprima@^2.6.0:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -1045,10 +1841,6 @@ esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
-esprima@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
-
 estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
@@ -1063,59 +1855,85 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.1.3"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
   dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
     is-stream "^1.1.0"
     npm-run-path "^2.0.0"
     p-finally "^1.0.0"
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expect@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.0.0.tgz#71f71d88a4202746fc79849bb4c6498008b5ef03"
+  dependencies:
+    ansi-styles "^3.2.0"
+    jest-get-type "^24.0.0"
+    jest-matcher-utils "^24.0.0"
+    jest-message-util "^24.0.0"
+    jest-regex-util "^24.0.0"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
   dependencies:
-    is-posix-bracket "^0.1.0"
+    is-extendable "^0.1.0"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
   dependencies:
-    fill-range "^2.1.0"
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
 
-extend@~3.0.0, extend@~3.0.1:
+extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+
+external-editor@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
   dependencies:
-    is-extglob "^1.0.0"
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
 extsprintf@1.3.0:
   version "1.3.0"
@@ -1125,9 +1943,20 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+
+fast-glob@^2.0.2:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -1137,11 +1966,15 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
-fb-watchman@^1.8.0, fb-watchman@^1.9.0:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.2.tgz#a24cf47827f82d38fb59a69ad70b76e3b6ae7383"
+fb-watchman@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
   dependencies:
-    bser "1.0.2"
+    bser "^2.0.0"
+
+figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
 
 figures@^2.0.0:
   version "2.0.0"
@@ -1149,28 +1982,27 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-
-fileset@^2.0.2:
+fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
 
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
   dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+find-npm-prefix@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
 
-find-up@^1.0.0, find-up@^1.1.2:
+find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
   dependencies:
@@ -1183,15 +2015,22 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
 
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+flush-write-stream@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
   dependencies:
-    for-in "^1.0.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.4"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
 forever-agent@~0.6.1:
   version "0.6.1"
@@ -1205,27 +2044,70 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-form-data@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-fs-extra@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
+fs-vacuum@^1.2.10:
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"
+  dependencies:
+    graceful-fs "^4.1.2"
+    path-is-inside "^1.0.1"
+    rimraf "^2.5.2"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fstream@^1.0.2:
+fsevents@^1.2.3:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
+fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
@@ -1234,7 +2116,7 @@ fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.0.2:
+function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -1251,15 +2133,22 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
 
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+gentle-fs@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.0.1.tgz#585cfd612bfc5cd52471fdb42537f016a5ce3687"
   dependencies:
-    is-property "^1.0.0"
+    aproba "^1.1.2"
+    fs-vacuum "^1.2.10"
+    graceful-fs "^4.1.11"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    path-is-inside "^1.0.2"
+    read-cmd-shim "^1.0.1"
+    slide "^1.1.6"
 
 get-caller-file@^1.0.1:
   version "1.0.2"
@@ -1293,9 +2182,15 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+get-stream@^4.0.0, get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
 
 getpass@^0.1.1:
   version "0.1.7"
@@ -1303,9 +2198,9 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^1.3.0, git-raw-commits@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.4.tgz#442c3df5985b4f5689e9e43597f5194736aac001"
+git-raw-commits@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -1320,9 +2215,9 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^1.3.0, git-semver-tags@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.4.tgz#2ceb2a355c6d7514c123c35e297067d08caf3a92"
+git-semver-tags@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3"
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -1333,19 +2228,6 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -1353,6 +2235,10 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
@@ -1375,49 +2261,60 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+glob@^7.1.1, glob@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^11.1.0:
+  version "11.10.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+globby@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
   dependencies:
     array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-got@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
+    dir-glob "2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+graceful-fs@^4.1.15:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+
+"growl@~> 1.10.0":
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
 
-growly@^1.2.0:
+growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-handlebars@^4.0.2, handlebars@^4.0.3:
+handlebars@^4.0.11:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  dependencies:
+    async "^2.5.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
+handlebars@^4.0.2:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
   dependencies:
@@ -1435,15 +2332,6 @@ har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
 har-validator@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@@ -1451,37 +2339,64 @@ har-validator@~4.2.1:
     ajv "^4.9.1"
     har-schema "^1.0.5"
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+har-validator@~5.1.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   dependencies:
-    ajv "^5.1.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
-has-unicode@^2.0.0:
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
     function-bind "^1.0.2"
 
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  dependencies:
+    function-bind "^1.1.1"
+
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -1491,35 +2406,19 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
-hoek@4.x.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
-hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
+hosted-git-info@^2.1.4:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
-html-encoding-sniffer@^1.0.1:
+hosted-git-info@^2.6.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+
+html-encoding-sniffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
   dependencies:
@@ -1532,6 +2431,17 @@ http-basic@^1.1.0:
     concat-stream "^1.4.6"
     http-response-object "^1.0.0"
 
+http-cache-semantics@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-response-object@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-1.1.0.tgz#a7c4e75aae82f3bb4904e4f43f615673b4d518c3"
@@ -1552,14 +2462,68 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.17:
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  dependencies:
+    ms "^2.0.0"
+
+iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -1581,42 +2545,75 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-ini@^1.3.2, ini@~1.3.0:
+ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-inquirer@^3.2.2:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+init-package-json@^1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    glob "^7.1.1"
+    npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0"
+    promzard "^0.3.0"
+    read "~1.0.1"
+    read-package-json "1 || 2"
+    semver "2.x || 3.x || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+    validate-npm-package-name "^3.0.0"
+
+inquirer@^6.2.0:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^2.0.4"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.3.0"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    strip-ansi "^5.0.0"
     through "^2.3.6"
 
-invariant@^2.2.2:
+invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^1.0.0:
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -1628,25 +2625,61 @@ is-buffer@^1.1.5:
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+
+is-ci@^1.0.10:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  dependencies:
+    ci-info "^1.0.0"
+
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  dependencies:
+    ci-info "^2.0.0"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
   dependencies:
-    builtin-modules "^1.0.0"
+    kind-of "^6.0.0"
 
-is-ci@^1.0.10, is-ci@^1.0.9:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
-  dependencies:
-    ci-info "^1.0.0"
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
 
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
   dependencies:
-    is-primitive "^2.0.0"
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
 
 is-expression@^3.0.0:
   version "3.0.0"
@@ -1655,15 +2688,17 @@ is-expression@^3.0.0:
     acorn "~4.0.2"
     object-assign "^4.0.1"
 
-is-extendable@^0.1.1:
+is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  dependencies:
+    is-plain-object "^2.0.4"
 
-is-extglob@^2.1.0:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
@@ -1683,11 +2718,9 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
+is-generator-fn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e"
 
 is-glob@^3.1.0:
   version "3.1.0"
@@ -1695,25 +2728,11 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-
-is-my-json-valid@^2.12.4:
-  version "2.17.2"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
   dependencies:
-    kind-of "^3.0.2"
+    is-extglob "^2.1.1"
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -1729,37 +2748,23 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  dependencies:
+    isobject "^3.0.1"
 
 is-promise@^2.0.0, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-
-is-regex@^1.0.3:
+is-regex@^1.0.3, is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
   dependencies:
     has "^1.0.1"
 
-is-retry-allowed@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-
-is-stream@^1.0.0, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
@@ -1767,6 +2772,12 @@ is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
 
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  dependencies:
+    has-symbols "^1.0.0"
+
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
@@ -1781,6 +2792,10 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -1795,274 +2810,394 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^1.1.0-alpha.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
-  dependencies:
-    async "^2.1.4"
-    compare-versions "^3.1.0"
-    fileset "^2.0.2"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-hook "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-report "^1.1.4"
-    istanbul-lib-source-maps "^1.2.4"
-    istanbul-reports "^1.3.0"
-    js-yaml "^3.7.0"
-    mkdirp "^0.5.1"
+istanbul-api@^2.0.8:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.0.tgz#37ab0c2c3e83065462f5254b94749d6157846c4e"
+  dependencies:
+    async "^2.6.1"
+    compare-versions "^3.2.1"
+    fileset "^2.0.3"
+    istanbul-lib-coverage "^2.0.3"
+    istanbul-lib-hook "^2.0.3"
+    istanbul-lib-instrument "^3.1.0"
+    istanbul-lib-report "^2.0.4"
+    istanbul-lib-source-maps "^3.0.2"
+    istanbul-reports "^2.1.0"
+    js-yaml "^3.12.0"
+    make-dir "^1.3.0"
+    minimatch "^3.0.4"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
+istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
 
-istanbul-lib-hook@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
+istanbul-lib-hook@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz#e0e581e461c611be5d0e5ef31c5f0109759916fb"
   dependencies:
-    append-transform "^0.4.0"
+    append-transform "^1.0.0"
 
-istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.4.2:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
-  dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.2.0"
-    semver "^5.3.0"
+istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz#a2b5484a7d445f1f311e93190813fa56dfb62971"
+  dependencies:
+    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    istanbul-lib-coverage "^2.0.3"
+    semver "^5.5.0"
 
-istanbul-lib-report@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+istanbul-lib-report@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz#bfd324ee0c04f59119cb4f07dab157d09f24d7e4"
   dependencies:
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
+    istanbul-lib-coverage "^2.0.3"
+    make-dir "^1.3.0"
+    supports-color "^6.0.0"
 
-istanbul-lib-source-maps@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz#f1e817229a9146e8424a28e5d69ba220fda34156"
   dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.3"
+    make-dir "^1.3.0"
+    rimraf "^2.6.2"
+    source-map "^0.6.1"
 
-istanbul-reports@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
+istanbul-reports@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.1.0.tgz#87b8b55cd1901ba1748964c98ddd8900ce306d59"
   dependencies:
-    handlebars "^4.0.3"
-
-jest-changed-files@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-17.0.2.tgz#f5657758736996f590a51b87e5c9369d904ba7b7"
+    handlebars "^4.0.11"
 
-jest-cli@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-18.1.0.tgz#5ead36ecad420817c2c9baa2aa7574f63257b3d6"
+jest-changed-files@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.0.0.tgz#c02c09a8cc9ca93f513166bc773741bd39898ff7"
   dependencies:
-    ansi-escapes "^1.4.0"
-    callsites "^2.0.0"
-    chalk "^1.1.1"
-    graceful-fs "^4.1.6"
-    is-ci "^1.0.9"
-    istanbul-api "^1.1.0-alpha.1"
-    istanbul-lib-coverage "^1.0.0"
-    istanbul-lib-instrument "^1.1.1"
-    jest-changed-files "^17.0.2"
-    jest-config "^18.1.0"
-    jest-environment-jsdom "^18.1.0"
-    jest-file-exists "^17.0.0"
-    jest-haste-map "^18.1.0"
-    jest-jasmine2 "^18.1.0"
-    jest-mock "^18.0.0"
-    jest-resolve "^18.1.0"
-    jest-resolve-dependencies "^18.1.0"
-    jest-runtime "^18.1.0"
-    jest-snapshot "^18.1.0"
-    jest-util "^18.1.0"
-    json-stable-stringify "^1.0.0"
-    node-notifier "^4.6.1"
-    sane "~1.4.1"
-    strip-ansi "^3.0.1"
-    throat "^3.0.0"
-    which "^1.1.1"
-    worker-farm "^1.3.1"
-    yargs "^6.3.0"
-
-jest-config@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-18.1.0.tgz#6111740a6d48aab86ff5a9e6ab0b98bd993b6ff4"
-  dependencies:
-    chalk "^1.1.1"
-    jest-environment-jsdom "^18.1.0"
-    jest-environment-node "^18.1.0"
-    jest-jasmine2 "^18.1.0"
-    jest-mock "^18.0.0"
-    jest-resolve "^18.1.0"
-    jest-util "^18.1.0"
-    json-stable-stringify "^1.0.0"
-
-jest-diff@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-18.1.0.tgz#4ff79e74dd988c139195b365dc65d87f606f4803"
-  dependencies:
-    chalk "^1.1.3"
-    diff "^3.0.0"
-    jest-matcher-utils "^18.1.0"
-    pretty-format "^18.1.0"
-
-jest-environment-jsdom@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-18.1.0.tgz#18b42f0c4ea2bae9f36cab3639b1e8f8c384e24e"
-  dependencies:
-    jest-mock "^18.0.0"
-    jest-util "^18.1.0"
-    jsdom "^9.9.1"
-
-jest-environment-node@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-18.1.0.tgz#4d6797572c8dda99acf5fae696eb62945547c779"
-  dependencies:
-    jest-mock "^18.0.0"
-    jest-util "^18.1.0"
-
-jest-file-exists@^17.0.0:
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-17.0.0.tgz#7f63eb73a1c43a13f461be261768b45af2cdd169"
-
-jest-haste-map@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-18.1.0.tgz#06839c74b770a40c1a106968851df8d281c08375"
-  dependencies:
-    fb-watchman "^1.9.0"
-    graceful-fs "^4.1.6"
-    micromatch "^2.3.11"
-    sane "~1.4.1"
-    worker-farm "^1.3.1"
+    execa "^1.0.0"
+    throat "^4.0.0"
 
-jest-jasmine2@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-18.1.0.tgz#094e104c2c189708766c77263bb2aecb5860a80b"
+jest-cli@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.0.0.tgz#691fd4f7bce2574c1865db6844a43b56e60ce2a4"
   dependencies:
-    graceful-fs "^4.1.6"
-    jest-matcher-utils "^18.1.0"
-    jest-matchers "^18.1.0"
-    jest-snapshot "^18.1.0"
-    jest-util "^18.1.0"
-
-jest-matcher-utils@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-18.1.0.tgz#1ac4651955ee2a60cef1e7fcc98cdfd773c0f932"
-  dependencies:
-    chalk "^1.1.3"
-    pretty-format "^18.1.0"
-
-jest-matchers@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-18.1.0.tgz#0341484bf87a1fd0bac0a4d2c899e2b77a3f1ead"
-  dependencies:
-    jest-diff "^18.1.0"
-    jest-matcher-utils "^18.1.0"
-    jest-util "^18.1.0"
-    pretty-format "^18.1.0"
-
-jest-mock@^18.0.0:
-  version "18.0.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-18.0.0.tgz#5c248846ea33fa558b526f5312ab4a6765e489b3"
-
-jest-resolve-dependencies@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-18.1.0.tgz#8134fb5caf59c9ed842fe0152ab01c52711f1bbb"
-  dependencies:
-    jest-file-exists "^17.0.0"
-    jest-resolve "^18.1.0"
-
-jest-resolve@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-18.1.0.tgz#6800accb536658c906cd5e29de412b1ab9ac249b"
-  dependencies:
-    browser-resolve "^1.11.2"
-    jest-file-exists "^17.0.0"
-    jest-haste-map "^18.1.0"
-    resolve "^1.2.0"
-
-jest-runtime@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-18.1.0.tgz#3abfd687175b21fc3b85a2b8064399e997859922"
-  dependencies:
-    babel-core "^6.0.0"
-    babel-jest "^18.0.0"
-    babel-plugin-istanbul "^3.0.0"
-    chalk "^1.1.3"
-    graceful-fs "^4.1.6"
-    jest-config "^18.1.0"
-    jest-file-exists "^17.0.0"
-    jest-haste-map "^18.1.0"
-    jest-mock "^18.0.0"
-    jest-resolve "^18.1.0"
-    jest-snapshot "^18.1.0"
-    jest-util "^18.1.0"
-    json-stable-stringify "^1.0.0"
-    micromatch "^2.3.11"
-    yargs "^6.3.0"
-
-jest-snapshot@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-18.1.0.tgz#55b96d2ee639c9bce76f87f2a3fd40b71c7a5916"
-  dependencies:
-    jest-diff "^18.1.0"
-    jest-file-exists "^17.0.0"
-    jest-matcher-utils "^18.1.0"
-    jest-util "^18.1.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.1.15"
+    import-local "^2.0.0"
+    is-ci "^2.0.0"
+    istanbul-api "^2.0.8"
+    istanbul-lib-coverage "^2.0.2"
+    istanbul-lib-instrument "^3.0.1"
+    istanbul-lib-source-maps "^3.0.1"
+    jest-changed-files "^24.0.0"
+    jest-config "^24.0.0"
+    jest-environment-jsdom "^24.0.0"
+    jest-get-type "^24.0.0"
+    jest-haste-map "^24.0.0"
+    jest-message-util "^24.0.0"
+    jest-regex-util "^24.0.0"
+    jest-resolve-dependencies "^24.0.0"
+    jest-runner "^24.0.0"
+    jest-runtime "^24.0.0"
+    jest-snapshot "^24.0.0"
+    jest-util "^24.0.0"
+    jest-validate "^24.0.0"
+    jest-watcher "^24.0.0"
+    jest-worker "^24.0.0"
+    micromatch "^3.1.10"
+    node-notifier "^5.2.1"
+    p-each-series "^1.0.0"
+    pirates "^4.0.0"
+    prompts "^2.0.1"
+    realpath-native "^1.0.0"
+    rimraf "^2.5.4"
+    slash "^2.0.0"
+    string-length "^2.0.0"
+    strip-ansi "^5.0.0"
+    which "^1.2.12"
+    yargs "^12.0.2"
+
+jest-config@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.0.0.tgz#878abe03c060c74a0ec30d3cd5dd1897873e030e"
+  dependencies:
+    "@babel/core" "^7.1.0"
+    babel-jest "^24.0.0"
+    chalk "^2.0.1"
+    glob "^7.1.1"
+    jest-environment-jsdom "^24.0.0"
+    jest-environment-node "^24.0.0"
+    jest-get-type "^24.0.0"
+    jest-jasmine2 "^24.0.0"
+    jest-regex-util "^24.0.0"
+    jest-resolve "^24.0.0"
+    jest-util "^24.0.0"
+    jest-validate "^24.0.0"
+    micromatch "^3.1.10"
+    pretty-format "^24.0.0"
+    realpath-native "^1.0.2"
+    uuid "^3.3.2"
+
+jest-diff@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.0.0.tgz#a3e5f573dbac482f7d9513ac9cfa21644d3d6b34"
+  dependencies:
+    chalk "^2.0.1"
+    diff-sequences "^24.0.0"
+    jest-get-type "^24.0.0"
+    pretty-format "^24.0.0"
+
+jest-docblock@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.0.0.tgz#54d77a188743e37f62181a91a01eb9222289f94e"
+  dependencies:
+    detect-newline "^2.1.0"
+
+jest-each@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.0.0.tgz#10987a06b21c7ffbfb7706c89d24c52ed864be55"
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^24.0.0"
+    jest-util "^24.0.0"
+    pretty-format "^24.0.0"
+
+jest-environment-jsdom@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.0.0.tgz#5affa0654d6e44cd798003daa1a8701dbd6e4d11"
+  dependencies:
+    jest-mock "^24.0.0"
+    jest-util "^24.0.0"
+    jsdom "^11.5.1"
+
+jest-environment-node@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.0.0.tgz#330948980656ed8773ce2e04eb597ed91e3c7190"
+  dependencies:
+    jest-mock "^24.0.0"
+    jest-util "^24.0.0"
+
+jest-get-type@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.0.0.tgz#36e72930b78e33da59a4f63d44d332188278940b"
+
+jest-haste-map@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.0.0.tgz#e9ef51b2c9257384b4d6beb83bd48c65b37b5e6e"
+  dependencies:
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.1.15"
+    invariant "^2.2.4"
+    jest-serializer "^24.0.0"
+    jest-util "^24.0.0"
+    jest-worker "^24.0.0"
+    micromatch "^3.1.10"
+    sane "^3.0.0"
+
+jest-jasmine2@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.0.0.tgz#7d87be9d8b32d34ac5980ad646b7ae7f99e33a19"
+  dependencies:
+    "@babel/traverse" "^7.1.0"
+    chalk "^2.0.1"
+    co "^4.6.0"
+    expect "^24.0.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^24.0.0"
+    jest-matcher-utils "^24.0.0"
+    jest-message-util "^24.0.0"
+    jest-snapshot "^24.0.0"
+    jest-util "^24.0.0"
+    pretty-format "^24.0.0"
+
+jest-leak-detector@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.0.0.tgz#78280119fd05ee98317daee62cddb3aa537a31c6"
+  dependencies:
+    pretty-format "^24.0.0"
+
+jest-matcher-utils@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.0.0.tgz#fc9c41cfc49b2c3ec14e576f53d519c37729d579"
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^24.0.0"
+    jest-get-type "^24.0.0"
+    pretty-format "^24.0.0"
+
+jest-message-util@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.0.0.tgz#a07a141433b2c992dbaec68d4cbfe470ba289619"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    chalk "^2.0.1"
+    micromatch "^3.1.10"
+    slash "^2.0.0"
+    stack-utils "^1.0.1"
+
+jest-mock@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.0.0.tgz#9a4b53e01d66a0e780f7d857462d063e024c617d"
+
+jest-regex-util@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.0.0.tgz#4feee8ec4a358f5bee0a654e94eb26163cb9089a"
+
+jest-resolve-dependencies@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.0.0.tgz#86540611d660bdcaab8b87d069247d3832811d94"
+  dependencies:
+    jest-regex-util "^24.0.0"
+    jest-snapshot "^24.0.0"
+
+jest-resolve@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.0.0.tgz#0206cfe842324f8796b01f706f4075309bf7b405"
+  dependencies:
+    browser-resolve "^1.11.3"
+    chalk "^2.0.1"
+    realpath-native "^1.0.0"
+
+jest-runner@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.0.0.tgz#00b280d52d23286111a8ed0362ed958283f7f0e3"
+  dependencies:
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-config "^24.0.0"
+    jest-docblock "^24.0.0"
+    jest-haste-map "^24.0.0"
+    jest-jasmine2 "^24.0.0"
+    jest-leak-detector "^24.0.0"
+    jest-message-util "^24.0.0"
+    jest-runtime "^24.0.0"
+    jest-util "^24.0.0"
+    jest-worker "^24.0.0"
+    source-map-support "^0.5.6"
+    throat "^4.0.0"
+
+jest-runtime@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.0.0.tgz#bc80756f5458c2c8e4db86f44b687ff692026c13"
+  dependencies:
+    "@babel/core" "^7.1.0"
+    babel-plugin-istanbul "^5.1.0"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    exit "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    jest-config "^24.0.0"
+    jest-haste-map "^24.0.0"
+    jest-message-util "^24.0.0"
+    jest-regex-util "^24.0.0"
+    jest-resolve "^24.0.0"
+    jest-snapshot "^24.0.0"
+    jest-util "^24.0.0"
+    jest-validate "^24.0.0"
+    micromatch "^3.1.10"
+    realpath-native "^1.0.0"
+    slash "^2.0.0"
+    strip-bom "3.0.0"
+    write-file-atomic "^2.4.2"
+    yargs "^12.0.2"
+
+jest-serializer@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0.tgz#522c44a332cdd194d8c0531eb06a1ee5afb4256b"
+
+jest-snapshot@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.0.0.tgz#fb447a753a3271660b3d89d068698014eb14c414"
+  dependencies:
+    "@babel/types" "^7.0.0"
+    chalk "^2.0.1"
+    jest-diff "^24.0.0"
+    jest-matcher-utils "^24.0.0"
+    jest-message-util "^24.0.0"
+    jest-resolve "^24.0.0"
+    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^18.1.0"
+    pretty-format "^24.0.0"
+    semver "^5.5.0"
 
-jest-util@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-18.1.0.tgz#3a99c32114ab17f84be094382527006e6d4bfc6a"
+jest-util@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.0.0.tgz#fd38fcafd6dedbd0af2944d7a227c0d91b68f7d6"
   dependencies:
-    chalk "^1.1.1"
-    diff "^3.0.0"
-    graceful-fs "^4.1.6"
-    jest-file-exists "^17.0.0"
-    jest-mock "^18.0.0"
+    callsites "^3.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.15"
+    is-ci "^2.0.0"
+    jest-message-util "^24.0.0"
     mkdirp "^0.5.1"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+
+jest-validate@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.0.0.tgz#aa8571a46983a6538328fef20406b4a496b6c020"
+  dependencies:
+    camelcase "^5.0.0"
+    chalk "^2.0.1"
+    jest-get-type "^24.0.0"
+    leven "^2.1.0"
+    pretty-format "^24.0.0"
+
+jest-watcher@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.0.0.tgz#20d44244d10b0b7312410aefd256c1c1eef68890"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    jest-util "^24.0.0"
+    string-length "^2.0.0"
 
-jest@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-18.1.0.tgz#bcebf1e203dee5c2ad2091c805300a343d9e6c7d"
+jest-worker@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.0.0.tgz#3d3483b077bf04f412f47654a27bba7e947f8b6d"
   dependencies:
-    jest-cli "^18.1.0"
+    merge-stream "^1.0.1"
+    supports-color "^6.1.0"
+
+jest@24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.0.0.tgz#b8e2c8e6274e1092c7f56e57762a1fdc7800201e"
+  dependencies:
+    import-local "^2.0.0"
+    jest-cli "^24.0.0"
 
 js-stringify@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
 
-js-tokens@^3.0.0, js-tokens@^3.0.2:
+js-tokens@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.7.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.9.0:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -2071,47 +3206,58 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jsdom@^9.9.1:
-  version "9.12.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+jsdom@^11.5.1:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
   dependencies:
-    abab "^1.0.3"
-    acorn "^4.0.4"
-    acorn-globals "^3.1.0"
+    abab "^2.0.0"
+    acorn "^5.5.3"
+    acorn-globals "^4.1.0"
     array-equal "^1.0.0"
-    content-type-parser "^1.0.1"
     cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
-    escodegen "^1.6.1"
-    html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.79.0"
-    sax "^1.2.1"
-    symbol-tree "^3.2.1"
-    tough-cookie "^2.3.2"
-    webidl-conversions "^4.0.0"
-    whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
-    xml-name-validator "^2.0.1"
-
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+    cssstyle "^1.0.0"
+    data-urls "^1.0.0"
+    domexception "^1.0.1"
+    escodegen "^1.9.1"
+    html-encoding-sniffer "^1.0.2"
+    left-pad "^1.3.0"
+    nwsapi "^2.0.7"
+    parse5 "4.0.0"
+    pn "^1.1.0"
+    request "^2.87.0"
+    request-promise-native "^1.0.5"
+    sax "^1.2.4"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.3.4"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^6.4.1"
+    ws "^5.2.0"
+    xml-name-validator "^3.0.0"
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+
+json-parse-better-errors@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
 json-parse-better-errors@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
@@ -2121,9 +3267,11 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+json5@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+  dependencies:
+    minimist "^1.2.0"
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -2139,10 +3287,6 @@ jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
 
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -2201,7 +3345,7 @@ jstransformer@1.0.0:
     is-promise "^2.0.0"
     promise "^7.0.1"
 
-kind-of@^3.0.2:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -2213,63 +3357,57 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
+kleur@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.1.tgz#4f5b313f5fa315432a400f19a24db78d451ede62"
+
 lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
   dependencies:
-    invert-kv "^1.0.0"
+    invert-kv "^2.0.0"
 
-lcov-parse@0.0.10:
+lcov-parse@^0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
 
-lerna@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.9.0.tgz#303f70bc50b1c4541bdcf54eda13c36fe54401f3"
-  dependencies:
-    async "^1.5.0"
-    chalk "^2.1.0"
-    cmd-shim "^2.0.2"
-    columnify "^1.5.4"
-    command-join "^2.0.0"
-    conventional-changelog-cli "^1.3.13"
-    conventional-recommended-bump "^1.2.1"
-    dedent "^0.7.0"
-    execa "^0.8.0"
-    find-up "^2.1.0"
-    fs-extra "^4.0.1"
-    get-port "^3.2.0"
-    glob "^7.1.2"
-    glob-parent "^3.1.0"
-    globby "^6.1.0"
-    graceful-fs "^4.1.11"
-    hosted-git-info "^2.5.0"
-    inquirer "^3.2.2"
-    is-ci "^1.0.10"
-    load-json-file "^4.0.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    npmlog "^4.1.2"
-    p-finally "^1.0.0"
-    package-json "^4.0.1"
-    path-exists "^3.0.0"
-    read-cmd-shim "^1.0.1"
-    read-pkg "^3.0.0"
-    rimraf "^2.6.1"
-    safe-buffer "^5.1.1"
-    semver "^5.4.1"
-    signal-exit "^3.0.2"
-    slash "^1.0.0"
-    strong-log-transformer "^1.0.6"
-    temp-write "^3.3.0"
-    write-file-atomic "^2.3.0"
-    write-json-file "^2.2.0"
-    write-pkg "^3.1.0"
-    yargs "^8.0.2"
+left-pad@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+
+lerna@3.10.8:
+  version "3.10.8"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.10.8.tgz#89e04b5e29f7d6acb3cec7ce59cec2d4343e5cf4"
+  dependencies:
+    "@lerna/add" "3.10.6"
+    "@lerna/bootstrap" "3.10.6"
+    "@lerna/changed" "3.10.8"
+    "@lerna/clean" "3.10.6"
+    "@lerna/cli" "3.10.7"
+    "@lerna/create" "3.10.6"
+    "@lerna/diff" "3.10.6"
+    "@lerna/exec" "3.10.6"
+    "@lerna/import" "3.10.6"
+    "@lerna/init" "3.10.6"
+    "@lerna/link" "3.10.6"
+    "@lerna/list" "3.10.6"
+    "@lerna/publish" "3.10.8"
+    "@lerna/run" "3.10.6"
+    "@lerna/version" "3.10.8"
+    import-local "^1.0.0"
+    libnpm "^2.0.1"
 
 less-plugin-inline-urls@^1.1.0:
   version "1.2.0"
@@ -2295,6 +3433,10 @@ less@^2.3.1:
     request "2.81.0"
     source-map "^0.5.3"
 
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -2302,6 +3444,97 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+libnpm@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpm/-/libnpm-2.0.1.tgz#a48fcdee3c25e13c77eb7c60a0efe561d7fb0d8f"
+  dependencies:
+    bin-links "^1.1.2"
+    bluebird "^3.5.3"
+    find-npm-prefix "^1.0.2"
+    libnpmaccess "^3.0.1"
+    libnpmconfig "^1.2.1"
+    libnpmhook "^5.0.2"
+    libnpmorg "^1.0.0"
+    libnpmpublish "^1.1.0"
+    libnpmsearch "^2.0.0"
+    libnpmteam "^1.0.1"
+    lock-verify "^2.0.2"
+    npm-lifecycle "^2.1.0"
+    npm-logical-tree "^1.2.1"
+    npm-package-arg "^6.1.0"
+    npm-profile "^4.0.1"
+    npm-registry-fetch "^3.8.0"
+    npmlog "^4.1.2"
+    pacote "^9.2.3"
+    read-package-json "^2.0.13"
+    stringify-package "^1.0.0"
+
+libnpmaccess@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8"
+  dependencies:
+    aproba "^2.0.0"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.1.0"
+    npm-registry-fetch "^3.8.0"
+
+libnpmconfig@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"
+  dependencies:
+    figgy-pudding "^3.5.1"
+    find-up "^3.0.0"
+    ini "^1.3.5"
+
+libnpmhook@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-5.0.2.tgz#d12817b0fb893f36f1d5be20017f2aea25825d94"
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
+libnpmorg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232"
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
+libnpmpublish@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.1.tgz#ff0c6bb0b4ad2bda2ad1f5fba6760a4af37125f0"
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    lodash.clonedeep "^4.5.0"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-registry-fetch "^3.8.0"
+    semver "^5.5.1"
+    ssri "^6.0.1"
+
+libnpmsearch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.0.tgz#de05af47ada81554a5f64276a69599070d4a5685"
+  dependencies:
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
+libnpmteam@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213"
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^3.8.0"
+
 line-json@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/line-json/-/line-json-1.0.0.tgz#6b40439bc8f41f666076daedeced1b1c68347669"
@@ -2322,15 +3555,6 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -2347,78 +3571,31 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash._arraycopy@^3.0.0:
+locate-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
-
-lodash._arrayeach@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
   dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
 
-lodash._baseclone@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz#303519bf6393fe7e42f34d8b630ef7794e3542b7"
+lock-verify@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.0.2.tgz#148e4f85974915c9e3c34d694b7de9ecb18ee7a8"
   dependencies:
-    lodash._arraycopy "^3.0.0"
-    lodash._arrayeach "^3.0.0"
-    lodash._baseassign "^3.0.0"
-    lodash._basefor "^3.0.0"
-    lodash.isarray "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._basefor@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
-
-lodash._bindcallback@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+    npm-package-arg "^5.1.2 || 6"
+    semver "^5.4.1"
 
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-lodash.clonedeep@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz#a0a1e40d82a5ea89ff5b147b8444ed63d92827db"
-  dependencies:
-    lodash._baseclone "^3.0.0"
-    lodash._bindcallback "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
 lodash.template@^4.0.2:
   version "4.4.0"
@@ -2433,17 +3610,17 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash.toarray@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
+lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.5:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
 
-lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
-log-driver@1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
+log-driver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -2462,29 +3639,63 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-
-lru-cache@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
+lru-cache@^4.1.2, lru-cache@^4.1.3:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  dependencies:
+    yallist "^3.0.2"
+
 make-dir@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
   dependencies:
     pify "^3.0.0"
 
+make-dir@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  dependencies:
+    pify "^3.0.0"
+
+make-fetch-happen@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.0.1"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
   dependencies:
     tmpl "1.0.x"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  dependencies:
+    p-defer "^1.0.0"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
@@ -2493,6 +3704,12 @@ map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
 
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
 markdown-it@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-7.0.1.tgz#f12d8b88a93e64254348dfd183bd70bf60567a42"
@@ -2503,29 +3720,17 @@ markdown-it@^7.0.0:
     mdurl "^1.0.1"
     uc.micro "^1.0.1"
 
-marked-terminal@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-2.0.0.tgz#5eaf568be66f686541afa52a558280310a31de2d"
-  dependencies:
-    cardinal "^1.0.0"
-    chalk "^1.1.3"
-    cli-table "^0.3.1"
-    lodash.assign "^4.2.0"
-    node-emoji "^1.4.1"
-
-marked@^0.3.12:
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.17.tgz#607f06668b3c6b1246b28f13da76116ac1aa2d2b"
-
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+mem@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
   dependencies:
+    map-age-cleaner "^0.1.1"
     mimic-fn "^1.0.0"
+    p-is-promise "^2.0.0"
 
 meow@^3.3.0:
   version "3.7.0"
@@ -2556,38 +3761,58 @@ meow@^4.0.0:
     redent "^2.0.0"
     trim-newlines "^2.0.0"
 
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  dependencies:
+    readable-stream "^2.0.1"
+
+merge2@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+
 merge@^1.1.3, merge@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
-micromatch@^2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
+micromatch@^3.1.10, micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
 
 mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
+mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+
+mime-types@^2.1.12, mime-types@~2.1.7:
   version "2.1.18"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
   dependencies:
     mime-db "~1.33.0"
 
+mime-types@~2.1.19:
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  dependencies:
+    mime-db "~1.37.0"
+
 mime@^1.2.11:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -2596,7 +3821,7 @@ mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
-minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -2613,18 +3838,49 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
-
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
+minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  dependencies:
+    minipass "^2.2.1"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -2635,43 +3891,156 @@ modify-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
 
-moment@^2.6.0:
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
+multimatch@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  dependencies:
+    array-differ "^1.0.0"
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    minimatch "^3.0.0"
+
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
+mute-stream@~0.0.4:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+
+nan@^2.9.2:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
-node-emoji@^1.4.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.8.1.tgz#6eec6bfb07421e2148c75c6bba72421f8530a826"
+needle@^2.2.1:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
+node-gyp@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
   dependencies:
-    lodash.toarray "^4.4.0"
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
 
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
 
-node-notifier@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-4.6.1.tgz#056d14244f3dcc1ceadfe68af9cff0c5473a33f3"
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+
+node-notifier@^5.2.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.3.0.tgz#c77a4a7b84038733d5fb351aafd8a268bfe19a01"
   dependencies:
-    cli-usage "^0.1.1"
-    growly "^1.2.0"
-    lodash.clonedeep "^3.0.0"
-    minimist "^1.1.1"
-    semver "^5.1.0"
-    shellwords "^0.1.0"
-    which "^1.0.5"
+    growly "^1.3.0"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
+
+node-pre-gyp@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+"nopt@2 || 3":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-package-data@^2.0.0, normalize-package-data@^2.4.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.2.tgz#6b2abd85774e51f7936f1395e45acb905dc849b2"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
 
 normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
   version "2.4.0"
@@ -2682,19 +4051,83 @@ normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+npm-bundled@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+
+npm-lifecycle@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
+  dependencies:
+    byline "^5.0.0"
+    graceful-fs "^4.1.11"
+    node-gyp "^3.8.0"
+    resolve-from "^4.0.0"
+    slide "^1.1.6"
+    uid-number "0.0.6"
+    umask "^1.1.0"
+    which "^1.3.1"
+
+npm-logical-tree@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88"
+
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^5.1.2 || 6", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.12, npm-packlist@^1.1.6:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+npm-pick-manifest@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  dependencies:
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-profile@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa"
+  dependencies:
+    aproba "^1.1.2 || 2"
+    figgy-pudding "^3.4.1"
+    npm-registry-fetch "^3.8.0"
+
+npm-registry-fetch@^3.8.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz#44d841780e2833f06accb34488f8c7450d1a6856"
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    npm-package-arg "^6.1.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -2707,26 +4140,54 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-"nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+nwsapi@^2.0.7:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
   dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-keys@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
 
-once@^1.3.0, once@^1.4.0:
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
+object.getownpropertydescriptors@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.1"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  dependencies:
+    isobject "^3.0.1"
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -2760,66 +4221,143 @@ os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+os-locale@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
+osenv@0, osenv@^0.1.4, osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+
+p-each-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
+p-is-promise@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
+
 p-limit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
   dependencies:
     p-try "^1.0.0"
 
+p-limit@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   dependencies:
     p-limit "^1.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  dependencies:
+    p-limit "^2.0.0"
+
+p-map-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
+  dependencies:
+    p-reduce "^1.0.0"
+
+p-map@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
+p-pipe@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
+
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
-package-json@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
+p-waterfall@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00"
+  dependencies:
+    p-reduce "^1.0.0"
+
+pacote@^9.2.3:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.1.tgz#f0af2a52d241bce523d39280ac810c671db62279"
+  dependencies:
+    bluebird "^3.5.3"
+    cacache "^11.3.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    npm-registry-fetch "^3.8.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
   dependencies:
-    got "^6.7.1"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
 
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -2833,9 +4371,13 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
 
 path-dirname@^1.0.0:
   version "1.0.2"
@@ -2851,11 +4393,15 @@ path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
-path-key@^2.0.0:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
@@ -2863,6 +4409,10 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -2871,12 +4421,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -2909,36 +4453,62 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pirates@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.0.tgz#850b18781b4ac6ec58a43c9ed9ec5fe6796addbd"
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  dependencies:
+    find-up "^3.0.0"
+
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
-prepend-http@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
 prettier@^1.3.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
 
-pretty-format@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-18.1.0.tgz#fb65a86f7a7f9194963eee91865c1bcf1039e284"
+pretty-format@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0.tgz#cb6599fd73ac088e37ed682f61291e4678f48591"
   dependencies:
-    ansi-styles "^2.2.1"
-
-private@^0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+    ansi-regex "^4.0.0"
+    ansi-styles "^3.2.0"
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
 promise@^6.0.0, promise@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
@@ -2957,6 +4527,29 @@ promise@~7.0.1:
   dependencies:
     asap "~2.0.3"
 
+prompts@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.1.tgz#201b3718b4276fb407f037db48c0029d6465245c"
+  dependencies:
+    kleur "^3.0.0"
+    sisteransi "^1.0.0"
+
+promzard@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  dependencies:
+    read "1"
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  dependencies:
+    genfun "^5.0.0"
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -2965,42 +4558,61 @@ pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+psl@^1.1.24, psl@^1.1.28:
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@^1.4.1, q@^1.5.1:
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+
+q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-
 qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-rc@^1.0.1, rc@^1.1.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
-    deep-extend "~0.4.0"
+    deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
@@ -3011,6 +4623,27 @@ read-cmd-shim@^1.0.1:
   dependencies:
     graceful-fs "^4.1.2"
 
+"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@^5.1.6:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -3018,13 +4651,6 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -3032,7 +4658,14 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^1.0.0, read-pkg@^1.1.0:
+read-pkg-up@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^3.0.0"
+
+read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
@@ -3040,14 +4673,6 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -3056,6 +4681,24 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+read@1, read@~1.0.1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  dependencies:
+    mute-stream "~0.0.4"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.4:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
@@ -3068,6 +4711,21 @@ readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+realpath-native@^1.0.0, realpath-native@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
+  dependencies:
+    util.promisify "^1.0.0"
+
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -3082,34 +4740,16 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-redeyed@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
-  dependencies:
-    esprima "~3.0.0"
-
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
-
-registry-url@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   dependencies:
-    rc "^1.0.1"
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
@@ -3119,7 +4759,7 @@ repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
-repeat-string@^1.5.2:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -3129,30 +4769,19 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
+request-promise-core@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
   dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
+    lodash "^4.13.1"
+
+request-promise-native@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+  dependencies:
+    request-promise-core "1.1.1"
+    stealthy-require "^1.1.0"
+    tough-cookie ">=2.3.3"
 
 request@2.81.0:
   version "2.81.0"
@@ -3181,32 +4810,30 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.79.0:
-  version "2.85.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+request@^2.85.0, request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   dependencies:
     aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
+    aws4 "^1.8.0"
     caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
     performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
     tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
+    uuid "^3.3.2"
 
 require-directory@^2.1.1:
   version "2.1.1"
@@ -3216,16 +4843,40 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
 resolve@1.1.7, resolve@~1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.2.0:
+resolve@^1.1.6:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.3.2:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+  dependencies:
+    path-parse "^1.0.6"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -3233,6 +4884,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -3245,53 +4904,110 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  dependencies:
+    glob "^7.1.3"
+
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
   dependencies:
     is-promise "^2.1.0"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
   dependencies:
-    rx-lite "*"
+    aproba "^1.1.1"
 
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+rxjs@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  dependencies:
+    tslib "^1.9.0"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-sane@~1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-1.4.1.tgz#88f763d74040f5f0c256b6163db399bf110ac715"
+safe-buffer@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
+sane@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-3.1.0.tgz#995193b7dc1445ef1fe41ddfca2faf9f111854c6"
   dependencies:
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
     exec-sh "^0.2.0"
-    fb-watchman "^1.8.0"
-    minimatch "^3.0.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.10.0"
+    watch "~0.18.0"
+  optionalDependencies:
+    fsevents "^1.2.3"
 
 sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
-sax@^1.2.1:
+sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
+"semver@2.x || 3.x || 4 || 5", semver@^5.5.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+
+semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -3302,7 +5018,7 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shellwords@^0.1.0:
+shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
 
@@ -3310,21 +5026,72 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+sisteransi@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+
+slide@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+smart-buffer@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
   dependencies:
     hoek "2.x.x"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+socks-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  dependencies:
+    agent-base "~4.2.0"
+    socks "~2.2.0"
+
+socks@~2.2.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.3.tgz#7399ce11e19b2a997153c983a9ccb6306721f2dc"
   dependencies:
-    hoek "4.x.x"
+    ip "^1.1.5"
+    smart-buffer "4.0.2"
 
 sort-keys@^2.0.0:
   version "2.0.0"
@@ -3332,11 +5099,26 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-map-support@^0.4.15:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
   dependencies:
-    source-map "^0.5.6"
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@^0.5.6:
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
 source-map@0.1.x:
   version "0.1.43"
@@ -3344,17 +5126,17 @@ source-map@0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.4.x, source-map@^0.4.4:
+source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
 
@@ -3380,6 +5162,12 @@ spdx-license-ids@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
@@ -3410,6 +5198,45 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+ssri@^6.0.0, ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+stack-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+stealthy-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+
+string-length@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  dependencies:
+    astral-regex "^1.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -3418,7 +5245,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -3431,7 +5258,17 @@ string_decoder@~1.0.3:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringify-package@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
+
+stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
@@ -3447,16 +5284,22 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  dependencies:
+    ansi-regex "^4.0.0"
+
+strip-bom@3.0.0, strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -3475,14 +5318,12 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-strong-log-transformer@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
+strong-log-transformer@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
   dependencies:
-    byline "^5.0.0"
     duplexer "^0.1.1"
-    minimist "^0.1.0"
-    moment "^2.6.0"
+    minimist "^1.2.0"
     through "^2.3.4"
 
 stylus@~0.54.5:
@@ -3496,23 +5337,19 @@ stylus@~0.54.5:
     sax "0.5.x"
     source-map "0.1.x"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^3.1.2:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
   dependencies:
     has-flag "^3.0.0"
 
-symbol-tree@^3.2.1:
+supports-color@^6.0.0, supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  dependencies:
+    has-flag "^3.0.0"
+
+symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
@@ -3524,11 +5361,31 @@ tar@^1.0.3:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+tar@^4, tar@^4.4.8:
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 temp-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
 
-temp-write@^3.3.0:
+temp-write@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
   dependencies:
@@ -3539,30 +5396,22 @@ temp-write@^3.3.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-tempfile@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
-  dependencies:
-    os-tmpdir "^1.0.0"
-    uuid "^2.0.1"
-
-test-exclude@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-3.3.0.tgz#7a17ca1239988c98367b0621456dbb7d4bc38977"
+test-exclude@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.1.0.tgz#6ba6b25179d2d38724824661323b73e03c0c1de1"
   dependencies:
     arrify "^1.0.1"
-    micromatch "^2.3.11"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
+    minimatch "^3.0.4"
+    read-pkg-up "^4.0.0"
     require-main-filename "^1.0.1"
 
 text-extensions@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
 
-throat@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"
+throat@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
 
 through2@^2.0.0, through2@^2.0.2:
   version "2.0.3"
@@ -3575,10 +5424,6 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -3593,19 +5438,70 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 token-stream@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
 
-tough-cookie@^2.3.2, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+tough-cookie@>=2.3.4:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+  dependencies:
+    ip-regex "^2.1.0"
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@^2.3.4:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@~2.3.0:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   dependencies:
     punycode "^1.4.1"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  dependencies:
+    punycode "^2.1.0"
 
 trim-newlines@^1.0.0:
   version "1.0.0"
@@ -3623,16 +5519,16 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -3660,6 +5556,13 @@ uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.10:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@^3.1.4:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  dependencies:
+    commander "~2.17.1"
+    source-map "~0.6.1"
+
 "uglify-js@github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7":
   version "2.7.3"
   resolved "https://codeload.github.com/mishoo/UglifyJS2/tar.gz/1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
@@ -3673,32 +5576,79 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uid-number@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+umask@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  dependencies:
+    imurmurhash "^0.1.4"
+
 universalify@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-
-url-parse-lax@^1.0.0:
+unset-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
   dependencies:
-    prepend-http "^1.0.1"
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-uuid@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+util.promisify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  dependencies:
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
 
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
+uuid@^3.0.0, uuid@^3.0.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
+uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+
 validate-npm-package-license@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
@@ -3706,6 +5656,19 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validate-npm-package-license@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  dependencies:
+    builtins "^1.0.3"
+
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -3718,15 +5681,24 @@ void-elements@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   dependencies:
     makeerror "1.0.x"
 
-watch@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
+watch@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
 
 wcwidth@^1.0.0:
   version "1.0.1"
@@ -3734,11 +5706,7 @@ wcwidth@^1.0.0:
   dependencies:
     defaults "^1.0.3"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0:
+webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
@@ -3748,22 +5716,43 @@ whatwg-encoding@^1.0.1:
   dependencies:
     iconv-lite "0.4.19"
 
-whatwg-url@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+whatwg-encoding@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+
+whatwg-url@^6.4.1:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
   dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+whatwg-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.0.5, which@^1.1.1, which@^1.2.9:
+which@1, which@^1.2.12, which@^1.3.0, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  dependencies:
+    isexe "^2.0.0"
+
+which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -3798,12 +5787,6 @@ wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
-worker-farm@^1.3.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  dependencies:
-    errno "~0.1.7"
-
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -3823,7 +5806,15 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-json-file@^2.2.0:
+write-file-atomic@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+write-json-file@^2.2.0, write-json-file@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
   dependencies:
@@ -3841,69 +5832,55 @@ write-pkg@^3.1.0:
     sort-keys "^2.0.0"
     write-json-file "^2.2.0"
 
-xml-name-validator@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+ws@^5.2.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  dependencies:
+    async-limiter "~1.0.0"
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
-xtend@^4.0.0, xtend@~4.0.1:
+xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
-yargs-parser@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
-  dependencies:
-    camelcase "^3.0.0"
-
-yargs-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  dependencies:
-    camelcase "^4.1.0"
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
 
-yargs@^6.3.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
   dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.2.0"
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
 
-yargs@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+yargs@^12.0.1, yargs@^12.0.2:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
   dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
     get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
+    os-locale "^3.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
     string-width "^2.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
 
 yargs@~3.10.0:
   version "3.10.0"

From 1d8cd3f3f0a98e6a69b2a2d13b22f32c56219f54 Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Wed, 24 Apr 2019 10:53:23 -0400
Subject: [PATCH 60/96] Add keywords to pug package.json (#3136)

Adds keywords to the main module package.json to improve searchability.
---
 packages/pug/package.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/pug/package.json b/packages/pug/package.json
index e84a4ece3..6f53ca721 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -1,6 +1,12 @@
 {
   "name": "pug",
   "description": "A clean, whitespace-sensitive template language for writing HTML",
+  "keywords": [
+    "html",
+    "jade",
+    "pug",
+    "template"
+  ],
   "version": "2.0.3",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [

From 6617f5058b95aa71d657336537814a4e9bf5b54a Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes.lindesay@threadsstyling.com>
Date: Mon, 29 Apr 2019 10:01:28 +0100
Subject: [PATCH 61/96] chore: update yarn.lock

---
 yarn.lock | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 01a516311..890ca91bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3610,14 +3610,10 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.5:
+lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
 
-lodash@^4.17.4, lodash@^4.2.1:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-
 log-driver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
@@ -5468,7 +5464,7 @@ token-stream@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
 
-tough-cookie@>=2.3.4:
+tough-cookie@>=2.3.3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
   integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==

From 2f1110ec2ed8656253331e1e4b1b20b9d12185ee Mon Sep 17 00:00:00 2001
From: Patrick Klingemann <patrick.klingemann@gmail.com>
Date: Tue, 21 May 2019 04:15:09 -0400
Subject: [PATCH 62/96] bump constantinople to 3.1.2 (#3141)

---
 packages/pug-code-gen/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index 2131ec12c..f2b02885e 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -6,7 +6,7 @@
     "pug"
   ],
   "dependencies": {
-    "constantinople": "^3.0.1",
+    "constantinople": "^3.1.2",
     "doctypes": "^1.1.0",
     "js-stringify": "^1.0.1",
     "pug-attrs": "^2.0.3",

From 8fcf81d4cadf11f9193562117c8fb897f740ce0e Mon Sep 17 00:00:00 2001
From: Yashar Fakhari <YasharF@users.noreply.github.com>
Date: Mon, 3 Jun 2019 09:11:20 -0700
Subject: [PATCH 63/96] Fix the dependency status badges in README.md of the
 child packages" (#3146)

* Fix the dependency status badges in README.MD of the child packages"

* Update Readme.md - add dependency status

Add dependency status from all of the monorepo children to the top level readme.md
---
 README.md                             | 20 ++++++++++++++++++--
 packages/pug-attrs/README.md          |  2 +-
 packages/pug-code-gen/README.md       |  2 +-
 packages/pug-error/README.md          |  2 +-
 packages/pug-filters/README.md        |  3 ++-
 packages/pug-lexer/README.md          |  3 ++-
 packages/pug-linker/README.md         |  3 ++-
 packages/pug-load/README.md           |  3 ++-
 packages/pug-parser/README.md         |  3 ++-
 packages/pug-runtime/README.md        |  3 ++-
 packages/pug-strip-comments/README.md |  3 ++-
 packages/pug-walk/README.md           |  3 ++-
 packages/pug/README.md                |  4 ++--
 13 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index cd8fde1ff..ef9cd59c9 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,29 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 
  [![Build Status](https://img.shields.io/travis/pugjs/pug/master.svg?style=flat)](https://travis-ci.org/pugjs/pug)
  [![Coverage Status](https://img.shields.io/coveralls/pugjs/pug/master.svg?style=flat)](https://coveralls.io/r/pugjs/pug?branch=master)
- [![Dependency Status](https://img.shields.io/david/pugjs/pug.svg?style=flat)](https://david-dm.org/pugjs/pug)
- [![devDependencies Status](https://img.shields.io/david/dev/pugjs/pug.svg?style=flat)](https://david-dm.org/pugjs/pug?type=dev)
  [![NPM version](https://img.shields.io/npm/v/pug.svg?style=flat)](https://www.npmjs.com/package/pug)
  [![Join Gitter Chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/pugjs/pug?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![OpenCollective](https://opencollective.com/pug/backers/badge.svg)](#backers) 
 [![OpenCollective](https://opencollective.com/pug/sponsors/badge.svg)](#sponsors)
 
+### Dependency Status
+
+| Package        | Dependencies           | Dev Dependencies  |
+| ------------- |:-------------| :-----|
+| mono-repo top      |  [![Dependency Status](https://img.shields.io/david/pugjs/pug.svg?style=flat)](https://david-dm.org/pugjs/pug) |  [![devDependencies Status](https://img.shields.io/david/dev/pugjs/pug.svg?style=flat)](https://david-dm.org/pugjs/pug?type=dev) |
+| pug | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug)](https://david-dm.org/pugjs/pug?path=packages/pug)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug)](https://david-dm.org/pugjs/pug?path=packages/pug&type=dev) |
+| pug-attrs      | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-attrs)](https://david-dm.org/pugjs/pug?path=packages/pug-attrs)      |   [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-attrs)](https://david-dm.org/pugjs/pug?path=packages/pug-attrs&type=dev) |
+| pug-code-gen | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-code-gen)](https://david-dm.org/pugjs/pug?path=packages/pug-code-gen)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-code-gen)](https://david-dm.org/pugjs/pug?path=packages/pug-code-gen&type=dev) |
+| pug-error | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-error)](https://david-dm.org/pugjs/pug?path=packages/pug-error)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-error)](https://david-dm.org/pugjs/pug?path=packages/pug-error&type=dev) |
+| pug-filters | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-filters)](https://david-dm.org/pugjs/pug?path=packages/pug-filters)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-filters)](https://david-dm.org/pugjs/pug?path=packages/pug-filters&type=dev) |
+| pug-lexer | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-lexer)](https://david-dm.org/pugjs/pug?path=packages/pug-lexer)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-lexer)](https://david-dm.org/pugjs/pug?path=packages/pug-lexer&type=dev) |
+| pug-linker | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-linker)](https://david-dm.org/pugjs/pug?path=packages/pug-linker)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-linker)](https://david-dm.org/pugjs/pug?path=packages/pug-linker&type=dev) |
+| pug-load | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-load)](https://david-dm.org/pugjs/pug?path=packages/pug-load)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-load)](https://david-dm.org/pugjs/pug?path=packages/pug-load&type=dev) |
+| pug-parser | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser&type=dev) |
+| pug-runtime | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime&type=dev) |
+| pug-strip-comments | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments&type=dev) |
+| pug-error | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk&type=dev) |
+
 ## Rename from "Jade"
 
 This project was formerly known as "Jade". However, it was revealed to us that "Jade" is a registered trademark; as a result, a rename was needed. After some discussion among the maintainers, **"Pug"** was chosen as the new name for this project. As of version 2, "pug" is the official package name.
diff --git a/packages/pug-attrs/README.md b/packages/pug-attrs/README.md
index a119eb715..25b3d7778 100644
--- a/packages/pug-attrs/README.md
+++ b/packages/pug-attrs/README.md
@@ -3,7 +3,7 @@
 Generate code for Pug attributes
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-attrs/master.svg)](https://travis-ci.org/pugjs/pug-attrs)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-attrs.svg)](https://david-dm.org/pugjs/pug-attrs)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-attrs)](https://david-dm.org/pugjs/pug?path=packages/pug-attrs)
 [![NPM version](https://img.shields.io/npm/v/pug-attrs.svg)](https://www.npmjs.org/package/pug-attrs)
 
 ## Installation
diff --git a/packages/pug-code-gen/README.md b/packages/pug-code-gen/README.md
index d180a0e57..16f031779 100644
--- a/packages/pug-code-gen/README.md
+++ b/packages/pug-code-gen/README.md
@@ -3,7 +3,7 @@
 Default code-generator for pug.  It generates HTML via a JavaScript template function.
 
 <!-- [![Build Status](https://img.shields.io/travis/pugjs/pug-code-gen/master.svg)](https://travis-ci.org/pugjs/pug-code-gen) -->
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-code-gen.svg)](https://david-dm.org/pugjs/pug-code-gen)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-code-gen)](https://david-dm.org/pugjs/pug?path=packages/pug-code-gen)
 [![npm version](https://img.shields.io/npm/v/pug-code-gen.svg)](https://www.npmjs.org/package/pug-code-gen)
 
 ## Installation
diff --git a/packages/pug-error/README.md b/packages/pug-error/README.md
index 0cbeec0e1..80c706ee7 100644
--- a/packages/pug-error/README.md
+++ b/packages/pug-error/README.md
@@ -3,7 +3,7 @@
 Standard error objects for pug.  This module is intended for use by the lexer, parser, loader, linker, code-generator and any plugins.
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-error/master.svg)](https://travis-ci.org/pugjs/pug-error)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-error.svg)](https://david-dm.org/pugjs/pug-error)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-error)](https://david-dm.org/pugjs/pug?path=packages/pug-error)
 [![NPM version](https://img.shields.io/npm/v/pug-error.svg)](https://www.npmjs.org/package/pug-error)
 
 ## Installation
diff --git a/packages/pug-filters/README.md b/packages/pug-filters/README.md
index baad8acbd..9c5cde18b 100644
--- a/packages/pug-filters/README.md
+++ b/packages/pug-filters/README.md
@@ -3,7 +3,8 @@
 Code for processing filters in pug templates
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-filters/master.svg)](https://travis-ci.org/pugjs/pug-filters)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-filters.svg)](https://david-dm.org/pugjs/pug-filters)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-filters)](https://david-dm.org/pugjs/pug?path=packages/pug-filters)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-filters)](https://david-dm.org/pugjs/pug?path=packages/pug-filters&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-filters.svg)](https://www.npmjs.org/package/pug-filters)
 
 ## Installation
diff --git a/packages/pug-lexer/README.md b/packages/pug-lexer/README.md
index 4363fa0f2..f9ac57481 100644
--- a/packages/pug-lexer/README.md
+++ b/packages/pug-lexer/README.md
@@ -3,7 +3,8 @@
 The pug lexer.  This module is responsible for taking a string and converting it into an array of tokens.
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-lexer/master.svg)](https://travis-ci.org/pugjs/pug-lexer)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-lexer.svg)](https://david-dm.org/pugjs/pug-lexer)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-lexer)](https://david-dm.org/pugjs/pug?path=packages/pug-lexer)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-lexer)](https://david-dm.org/pugjs/pug?path=packages/pug-lexer&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-lexer.svg)](https://www.npmjs.org/package/pug-lexer)
 [![Coverage Status](https://img.shields.io/codecov/c/github/pugjs/pug-lexer.svg)](https://codecov.io/gh/pugjs/pug-lexer)
 
diff --git a/packages/pug-linker/README.md b/packages/pug-linker/README.md
index 02ed9eb43..6297b2476 100644
--- a/packages/pug-linker/README.md
+++ b/packages/pug-linker/README.md
@@ -3,7 +3,8 @@
 Link multiple pug ASTs together using include/extends
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-linker/master.svg)](https://travis-ci.org/pugjs/pug-linker)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-linker.svg)](https://david-dm.org/pugjs/pug-linker)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-linker)](https://david-dm.org/pugjs/pug?path=packages/pug-linker)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-linker)](https://david-dm.org/pugjs/pug?path=packages/pug-linker&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-linker.svg)](https://www.npmjs.org/package/pug-linker)
 
 ## Installation
diff --git a/packages/pug-load/README.md b/packages/pug-load/README.md
index abbc968f1..5d19340d6 100644
--- a/packages/pug-load/README.md
+++ b/packages/pug-load/README.md
@@ -3,7 +3,8 @@
 The pug loader is responsible for loading the depenendencies of a given pug file.  It adds `fullPath` and `str` properties to every `Include` and `Extends` node.  It also adds an `ast` property to any `Include` nodes that are loading pug and any `Extends` nodes.  It then recursively loads the dependencies of any of those included files.
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-load/master.svg)](https://travis-ci.org/pugjs/pug-load)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-load.svg)](https://david-dm.org/pugjs/pug-load)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-load)](https://david-dm.org/pugjs/pug?path=packages/pug-load)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-load)](https://david-dm.org/pugjs/pug?path=packages/pug-load&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-load.svg)](https://www.npmjs.org/package/pug-load)
 [![Coverage Status](https://img.shields.io/codecov/c/github/pugjs/pug-load.svg)](https://codecov.io/gh/pugjs/pug-load)
 
diff --git a/packages/pug-parser/README.md b/packages/pug-parser/README.md
index cfb4c0d04..c8fc2cb6a 100644
--- a/packages/pug-parser/README.md
+++ b/packages/pug-parser/README.md
@@ -3,7 +3,8 @@
 The pug parser (takes an array of tokens and converts it to an abstract syntax tree)
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-parser/master.svg)](https://travis-ci.org/pugjs/pug-parser)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-parser.svg)](https://david-dm.org/pugjs/pug-parser)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-parser.svg)](https://www.npmjs.org/package/pug-parser)
 
 ## Installation
diff --git a/packages/pug-runtime/README.md b/packages/pug-runtime/README.md
index 86a8cc4c4..fc5dc5f8b 100644
--- a/packages/pug-runtime/README.md
+++ b/packages/pug-runtime/README.md
@@ -3,7 +3,8 @@
 The runtime components for the pug templating language
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-runtime/master.svg)](https://travis-ci.org/pugjs/pug-runtime)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-runtime.svg)](https://david-dm.org/pugjs/pug-runtime)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-runtime.svg)](https://www.npmjs.org/package/pug-runtime)
 
 ## Installation
diff --git a/packages/pug-strip-comments/README.md b/packages/pug-strip-comments/README.md
index e10820b41..7b0e1eef9 100644
--- a/packages/pug-strip-comments/README.md
+++ b/packages/pug-strip-comments/README.md
@@ -3,7 +3,8 @@
 Strips comments from Pug token stream
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-strip-comments/master.svg)](https://travis-ci.org/pugjs/pug-strip-comments)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-strip-comments.svg)](https://david-dm.org/pugjs/pug-strip-comments)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments&type=dev)
 [![NPM version](https://img.shields.io/npm/v/pug-strip-comments.svg)](https://www.npmjs.org/package/pug-strip-comments)
 
 ## Installation
diff --git a/packages/pug-walk/README.md b/packages/pug-walk/README.md
index e0ec152a9..90da52efa 100644
--- a/packages/pug-walk/README.md
+++ b/packages/pug-walk/README.md
@@ -3,7 +3,8 @@
 Walk and transform a Pug AST
 
 [![Build Status](https://img.shields.io/travis/pugjs/pug-walk/master.svg)](https://travis-ci.org/pugjs/pug-walk)
-[![Dependency Status](https://img.shields.io/david/pugjs/pug-walk.svg)](https://david-dm.org/pugjs/pug-walk)
+[![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk)
+[![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk&type=dev)
 [![npm version](https://img.shields.io/npm/v/pug-walk.svg)](https://www.npmjs.org/package/pug-walk)
 [![Coverage Status](https://img.shields.io/codecov/c/github/pugjs/pug-walk/master.svg)](https://codecov.io/gh/pugjs/pug-walk/branch/master)
 
diff --git a/packages/pug/README.md b/packages/pug/README.md
index 4e626b498..9cb7135f4 100644
--- a/packages/pug/README.md
+++ b/packages/pug/README.md
@@ -14,8 +14,8 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 
  [![Build Status](https://img.shields.io/travis/pugjs/pug/master.svg?style=flat)](https://travis-ci.org/pugjs/pug)
  [![Coverage Status](https://img.shields.io/coveralls/pugjs/pug/master.svg?style=flat)](https://coveralls.io/r/pugjs/pug?branch=master)
- [![Dependency Status](https://img.shields.io/david/pugjs/pug.svg?style=flat)](https://david-dm.org/pugjs/pug)
- [![devDependencies Status](https://img.shields.io/david/dev/pugjs/pug.svg?style=flat)](https://david-dm.org/pugjs/pug?type=dev)
+ [![Dependency Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug)](https://david-dm.org/pugjs/pug?path=packages/pug)
+ [![DevDependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug)](https://david-dm.org/pugjs/pug?path=packages/pug&type=dev)
  [![NPM version](https://img.shields.io/npm/v/pug.svg?style=flat)](https://www.npmjs.com/package/pug)
  [![Join Gitter Chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/pugjs/pug?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

From 4fd657a35e690baf2f742b863fa8fad9e1d2ad45 Mon Sep 17 00:00:00 2001
From: Yashar Fakhari <YasharF@users.noreply.github.com>
Date: Tue, 4 Jun 2019 02:46:42 -0700
Subject: [PATCH 64/96] Update repo URLs in packages (#3148)

---
 packages/pug-attrs/package.json          | 2 +-
 packages/pug-code-gen/package.json       | 2 +-
 packages/pug-error/package.json          | 2 +-
 packages/pug-filters/package.json        | 2 +-
 packages/pug-lexer/package.json          | 2 +-
 packages/pug-linker/package.json         | 2 +-
 packages/pug-load/package.json           | 2 +-
 packages/pug-parser/package.json         | 2 +-
 packages/pug-runtime/package.json        | 2 +-
 packages/pug-strip-comments/package.json | 2 +-
 packages/pug-walk/package.json           | 2 +-
 packages/pug/package.json                | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/pug-attrs/package.json b/packages/pug-attrs/package.json
index 430746789..41a80f32a 100644
--- a/packages/pug-attrs/package.json
+++ b/packages/pug-attrs/package.json
@@ -15,7 +15,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-attrs.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-attrs"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index f2b02885e..412d345e3 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -20,7 +20,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-code-gen.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-code-gen"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-error/package.json b/packages/pug-error/package.json
index 6c2c9c6df..545f8aaf3 100644
--- a/packages/pug-error/package.json
+++ b/packages/pug-error/package.json
@@ -10,7 +10,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-error.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-error"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index ab640c0ff..2fea89aa8 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -33,7 +33,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-filters.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-filters"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index 838cc46ed..c1ff30826 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-lexer.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-lexer"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index 8a13f270d..bf60ae6fe 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -19,7 +19,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-linker.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-linker"
   },
   "author": "Forbes Lindesay",
   "license": "MIT"
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index 2f3743890..2aef07adb 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-load.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-load"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index 16fc3dc42..feafbbc46 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -18,7 +18,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-parser.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-parser"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug-runtime/package.json b/packages/pug-runtime/package.json
index 247f0a8ee..67a367866 100644
--- a/packages/pug-runtime/package.json
+++ b/packages/pug-runtime/package.json
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-runtime.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-runtime"
   },
   "browser": {
     "fs": false
diff --git a/packages/pug-strip-comments/package.json b/packages/pug-strip-comments/package.json
index 49d6b7423..683f7c447 100644
--- a/packages/pug-strip-comments/package.json
+++ b/packages/pug-strip-comments/package.json
@@ -16,7 +16,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-strip-comments.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-strip-comments"
   },
   "author": "Timothy Gu <timothygu99@gmail.com>",
   "license": "MIT"
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index e20552fb1..8c4976369 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -14,7 +14,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/pugjs/pug-walk.git"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug-walk"
   },
   "author": "ForbesLindesay",
   "license": "MIT"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 6f53ca721..a5286e457 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -22,7 +22,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git://github.com/pugjs/pug"
+    "url": "https://github.com/pugjs/pug/tree/master/packages/pug"
   },
   "main": "lib",
   "dependencies": {

From 8e8eeee0ae373b3d57733f41d1443ea05ea030d4 Mon Sep 17 00:00:00 2001
From: Eugene Zhlobo <ezhlobo@gmail.com>
Date: Tue, 18 Jun 2019 12:36:37 +0300
Subject: [PATCH 65/96] Allow spread operator in attributes - N.B. for jsx
 transform only (#3152)

Currently we only support spread attributes in the transform for producing jsx. Although this adds support for them at the lexer level, they will just be blindly included in the output html when using the standard pug instance. In the future we may introduce proper spread properties to pug as well.
---
 packages/pug-lexer/index.js                   |   6 +-
 .../test/__snapshots__/index.test.js.snap     | 372 +++++++++++++++++-
 packages/pug-lexer/test/cases/attrs.js.pug    |   5 +
 3 files changed, 378 insertions(+), 5 deletions(-)

diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index 434e3a048..9ad073eac 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -1218,7 +1218,11 @@ Lexer.prototype = {
             if (!this.whitespaceRe.test(str[x])) {
               // if it is a JavaScript punctuator, then assume that it is
               // a part of the value
-              if((!characterParser.isPunctuator(str[x]) || quoteRe.test(str[x]) || str[x] === ':') && this.assertExpression(val, true)){
+              const isNotPunctuator = !characterParser.isPunctuator(str[x])
+              const isQuote = quoteRe.test(str[x])
+              const isColon = str[x] === ':'
+              const isSpreadOperator = str[x] + str[x + 1] + str[x + 2] === '...'
+              if ((isNotPunctuator || isQuote || isColon || isSpreadOperator) && this.assertExpression(val, true)) {
                 done = true;
               }
               break;
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index 962d17d9a..a6457e527 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -1303,12 +1303,12 @@ Array [
     "loc": Object {
       "end": Object {
         "column": 1,
-        "line": 18,
+        "line": 19,
       },
       "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
       "start": Object {
         "column": 1,
-        "line": 18,
+        "line": 19,
       },
     },
     "type": "newline",
@@ -1316,13 +1316,377 @@ Array [
   Object {
     "loc": Object {
       "end": Object {
+        "column": 4,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
         "column": 1,
-        "line": 18,
+        "line": 19,
+      },
+    },
+    "type": "tag",
+    "val": "div",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 19,
+      },
+    },
+    "type": "start-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 19,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 19,
+      },
+    },
+    "mustEscape": true,
+    "name": "...object",
+    "type": "attribute",
+    "val": true,
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 15,
+        "line": 19,
       },
       "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
       "start": Object {
+        "column": 14,
+        "line": 19,
+      },
+    },
+    "type": "end-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
         "column": 1,
-        "line": 18,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 20,
+      },
+    },
+    "type": "tag",
+    "val": "div",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 20,
+      },
+    },
+    "type": "start-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 14,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 20,
+      },
+    },
+    "mustEscape": true,
+    "name": "...object",
+    "type": "attribute",
+    "val": true,
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 28,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 15,
+        "line": 20,
+      },
+    },
+    "mustEscape": true,
+    "name": "after",
+    "type": "attribute",
+    "val": "\\"after\\"",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 29,
+        "line": 20,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 28,
+        "line": 20,
+      },
+    },
+    "type": "end-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 21,
+      },
+    },
+    "type": "tag",
+    "val": "div",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 21,
+      },
+    },
+    "type": "start-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 21,
+      },
+    },
+    "mustEscape": true,
+    "name": "before",
+    "type": "attribute",
+    "val": "\\"before\\"",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 21,
+      },
+    },
+    "mustEscape": true,
+    "name": "...object",
+    "type": "attribute",
+    "val": true,
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 31,
+        "line": 21,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 30,
+        "line": 21,
+      },
+    },
+    "type": "end-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 4,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 22,
+      },
+    },
+    "type": "tag",
+    "val": "div",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 5,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 4,
+        "line": 22,
+      },
+    },
+    "type": "start-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 20,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 5,
+        "line": 22,
+      },
+    },
+    "mustEscape": true,
+    "name": "before",
+    "type": "attribute",
+    "val": "\\"before\\"",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 30,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 21,
+        "line": 22,
+      },
+    },
+    "mustEscape": true,
+    "name": "...object",
+    "type": "attribute",
+    "val": true,
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 44,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 31,
+        "line": 22,
+      },
+    },
+    "mustEscape": true,
+    "name": "after",
+    "type": "attribute",
+    "val": "\\"after\\"",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 45,
+        "line": 22,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 44,
+        "line": 22,
+      },
+    },
+    "type": "end-attributes",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
+      },
+    },
+    "type": "newline",
+  },
+  Object {
+    "loc": Object {
+      "end": Object {
+        "column": 1,
+        "line": 23,
+      },
+      "filename": "<basedir>/packages/pug-lexer/test/cases/attrs.js.pug",
+      "start": Object {
+        "column": 1,
+        "line": 23,
       },
     },
     "type": "eos",
diff --git a/packages/pug-lexer/test/cases/attrs.js.pug b/packages/pug-lexer/test/cases/attrs.js.pug
index 910c13a25..d989be8d6 100644
--- a/packages/pug-lexer/test/cases/attrs.js.pug
+++ b/packages/pug-lexer/test/cases/attrs.js.pug
@@ -15,3 +15,8 @@ a.tag-class(class = ['class1', 'class2'])
 div(id=id)&attributes({foo: 'bar'})
 - var bar = null
 div(foo=null bar=bar)&attributes({baz: 'baz'})
+
+div(...object)
+div(...object after="after")
+div(before="before" ...object)
+div(before="before" ...object after="after")

From 5e47ab41336aba783e7701f0616d277ffa52f1d8 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 18 Jun 2019 10:41:00 +0100
Subject: [PATCH 66/96] chore: update yarn.lock

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 890ca91bd..81d9770e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1394,7 +1394,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
-constantinople@^3.0.1:
+constantinople@^3.0.1, constantinople@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
   dependencies:

From 1bdf628a70fda7a0d840c52f3abce54b1c6b0130 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 18 Jun 2019 10:44:49 +0100
Subject: [PATCH 67/96] Publish

 - pug-attrs@2.0.4
 - pug-code-gen@2.0.2
 - pug-error@1.3.3
 - pug-filters@3.1.1
 - pug-lexer@4.1.0
 - pug-linker@3.0.6
 - pug-load@2.0.12
 - pug-parser@5.0.1
 - pug-runtime@2.0.5
 - pug-strip-comments@1.0.4
 - pug-walk@1.1.8
 - pug@2.0.4
---
 packages/pug-attrs/package.json          |  4 ++--
 packages/pug-code-gen/package.json       |  8 ++++----
 packages/pug-error/package.json          |  2 +-
 packages/pug-filters/package.json        | 12 ++++++------
 packages/pug-lexer/package.json          |  4 ++--
 packages/pug-linker/package.json         | 12 ++++++------
 packages/pug-load/package.json           |  8 ++++----
 packages/pug-parser/package.json         |  4 ++--
 packages/pug-runtime/package.json        |  2 +-
 packages/pug-strip-comments/package.json |  4 ++--
 packages/pug-walk/package.json           |  6 +++---
 packages/pug/package.json                | 18 +++++++++---------
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/packages/pug-attrs/package.json b/packages/pug-attrs/package.json
index 41a80f32a..e4b465dd8 100644
--- a/packages/pug-attrs/package.json
+++ b/packages/pug-attrs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-attrs",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Generate code for Pug attributes",
   "keywords": [
     "pug"
@@ -8,7 +8,7 @@
   "dependencies": {
     "constantinople": "^3.0.1",
     "js-stringify": "^1.0.1",
-    "pug-runtime": "^2.0.4"
+    "pug-runtime": "^2.0.5"
   },
   "files": [
     "index.js"
diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index 412d345e3..acc3b97d7 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-code-gen",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Default code-generator for pug.  It generates HTML via a JavaScript template function.",
   "keywords": [
     "pug"
@@ -9,9 +9,9 @@
     "constantinople": "^3.1.2",
     "doctypes": "^1.1.0",
     "js-stringify": "^1.0.1",
-    "pug-attrs": "^2.0.3",
-    "pug-error": "^1.3.2",
-    "pug-runtime": "^2.0.4",
+    "pug-attrs": "^2.0.4",
+    "pug-error": "^1.3.3",
+    "pug-runtime": "^2.0.5",
     "void-elements": "^2.0.1",
     "with": "^5.0.0"
   },
diff --git a/packages/pug-error/package.json b/packages/pug-error/package.json
index 545f8aaf3..2cf393930 100644
--- a/packages/pug-error/package.json
+++ b/packages/pug-error/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-error",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Standard error objects for pug",
   "keywords": [
     "pug"
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 2fea89aa8..922577ae5 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-filters",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Code for processing filters in pug templates",
   "keywords": [
     "pug"
@@ -9,8 +9,8 @@
     "clean-css": "^4.1.11",
     "constantinople": "^3.0.1",
     "jstransformer": "1.0.0",
-    "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.7",
+    "pug-error": "^1.3.3",
+    "pug-walk": "^1.1.8",
     "resolve": "^1.1.6",
     "uglify-js": "^2.6.1"
   },
@@ -22,9 +22,9 @@
     "jstransformer-markdown-it": "^1.0.0",
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
-    "pug-lexer": "^4.0.0",
-    "pug-load": "^2.0.11",
-    "pug-parser": "^5.0.0"
+    "pug-lexer": "^4.1.0",
+    "pug-load": "^2.0.12",
+    "pug-parser": "^5.0.1"
   },
   "files": [
     "lib/handle-filters.js",
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index c1ff30826..b4a3cb131 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-lexer",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "The pug lexer (takes a string and converts it to an array of tokens)",
   "keywords": [
     "pug"
@@ -8,7 +8,7 @@
   "dependencies": {
     "character-parser": "^2.1.1",
     "is-expression": "^3.0.0",
-    "pug-error": "^1.3.2"
+    "pug-error": "^1.3.3"
   },
   "devDependencies": {
     "acorn": "^3.0.4"
diff --git a/packages/pug-linker/package.json b/packages/pug-linker/package.json
index bf60ae6fe..6170584aa 100644
--- a/packages/pug-linker/package.json
+++ b/packages/pug-linker/package.json
@@ -1,18 +1,18 @@
 {
   "name": "pug-linker",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "Link multiple pug ASTs together using include/extends",
   "keywords": [
     "pug"
   ],
   "dependencies": {
-    "pug-error": "^1.3.2",
-    "pug-walk": "^1.1.7"
+    "pug-error": "^1.3.3",
+    "pug-walk": "^1.1.8"
   },
   "devDependencies": {
-    "pug-lexer": "^4.0.0",
-    "pug-load": "^2.0.11",
-    "pug-parser": "^5.0.0"
+    "pug-lexer": "^4.1.0",
+    "pug-load": "^2.0.12",
+    "pug-parser": "^5.0.1"
   },
   "files": [
     "index.js"
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index 2aef07adb..97f805156 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -1,17 +1,17 @@
 {
   "name": "pug-load",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "The Pug loader is responsible for loading the depenendencies of a given Pug file.",
   "keywords": [
     "pug"
   ],
   "dependencies": {
     "object-assign": "^4.1.0",
-    "pug-walk": "^1.1.7"
+    "pug-walk": "^1.1.8"
   },
   "devDependencies": {
-    "pug-lexer": "^4.0.0",
-    "pug-parser": "^5.0.0"
+    "pug-lexer": "^4.1.0",
+    "pug-parser": "^5.0.1"
   },
   "files": [
     "index.js"
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index feafbbc46..e97f25ca8 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -1,12 +1,12 @@
 {
   "name": "pug-parser",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree)",
   "keywords": [
     "pug"
   ],
   "dependencies": {
-    "pug-error": "^1.3.2",
+    "pug-error": "^1.3.3",
     "token-stream": "0.0.1"
   },
   "devDependencies": {
diff --git a/packages/pug-runtime/package.json b/packages/pug-runtime/package.json
index 67a367866..c13a435ce 100644
--- a/packages/pug-runtime/package.json
+++ b/packages/pug-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pug-runtime",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "The runtime components for the pug templating language",
   "keywords": [
     "pug"
diff --git a/packages/pug-strip-comments/package.json b/packages/pug-strip-comments/package.json
index 683f7c447..ace9f8ab0 100644
--- a/packages/pug-strip-comments/package.json
+++ b/packages/pug-strip-comments/package.json
@@ -1,12 +1,12 @@
 {
   "name": "pug-strip-comments",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Strip comments from a Pug token stream (from the lexer)",
   "keywords": [
     "pug"
   ],
   "dependencies": {
-    "pug-error": "^1.3.2"
+    "pug-error": "^1.3.3"
   },
   "devDependencies": {
     "line-json": "^1.0.0"
diff --git a/packages/pug-walk/package.json b/packages/pug-walk/package.json
index 8c4976369..2f77584d1 100644
--- a/packages/pug-walk/package.json
+++ b/packages/pug-walk/package.json
@@ -1,13 +1,13 @@
 {
   "name": "pug-walk",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Walk and transform a pug AST",
   "keywords": [
     "pug"
   ],
   "devDependencies": {
-    "pug-lexer": "^4.0.0",
-    "pug-parser": "^5.0.0"
+    "pug-lexer": "^4.1.0",
+    "pug-parser": "^5.0.1"
   },
   "files": [
     "index.js"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index a5286e457..cee45620c 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -7,7 +7,7 @@
     "pug",
     "template"
   ],
-  "version": "2.0.3",
+  "version": "2.0.4",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "maintainers": [
     "Forbes Lindesay <forbes@lindesay.co.uk>",
@@ -26,14 +26,14 @@
   },
   "main": "lib",
   "dependencies": {
-    "pug-code-gen": "^2.0.1",
-    "pug-filters": "^3.1.0",
-    "pug-lexer": "^4.0.0",
-    "pug-linker": "^3.0.5",
-    "pug-load": "^2.0.11",
-    "pug-parser": "^5.0.0",
-    "pug-runtime": "^2.0.4",
-    "pug-strip-comments": "^1.0.3"
+    "pug-code-gen": "^2.0.2",
+    "pug-filters": "^3.1.1",
+    "pug-lexer": "^4.1.0",
+    "pug-linker": "^3.0.6",
+    "pug-load": "^2.0.12",
+    "pug-parser": "^5.0.1",
+    "pug-runtime": "^2.0.5",
+    "pug-strip-comments": "^1.0.4"
   },
   "devDependencies": {
     "jstransformer-cdata": "^1.0.0",

From a0ff15f579e43f44d9e66f5321096bbcb0b603cf Mon Sep 17 00:00:00 2001
From: natmbake <48433483+natmbake@users.noreply.github.com>
Date: Tue, 18 Jun 2019 11:52:34 +0200
Subject: [PATCH 68/96] test: inline and include markdown-it should produce the
 same output (#3119)

---
 .travis.yml                                         |  2 +-
 packages/pug/test/markdown-it/comment.md            |  1 +
 packages/pug/test/markdown-it/index.test.js         | 13 +++++++++++++
 .../test/markdown-it/layout-markdown-include.pug    |  1 +
 .../pug/test/markdown-it/layout-markdown-inline.pug |  2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 packages/pug/test/markdown-it/comment.md
 create mode 100644 packages/pug/test/markdown-it/index.test.js
 create mode 100644 packages/pug/test/markdown-it/layout-markdown-include.pug
 create mode 100644 packages/pug/test/markdown-it/layout-markdown-inline.pug

diff --git a/.travis.yml b/.travis.yml
index 39f094817..3c2bbf83d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ node_js:
   - "6"
   - "8"
   - "10"
-  - "11"
+  - "12"
 
 # Use faster Docker architecture on Travis.
 sudo: false
diff --git a/packages/pug/test/markdown-it/comment.md b/packages/pug/test/markdown-it/comment.md
new file mode 100644
index 000000000..b84a7bb24
--- /dev/null
+++ b/packages/pug/test/markdown-it/comment.md
@@ -0,0 +1 @@
+<h1 id="myHeader">Hello World!</h1>
\ No newline at end of file
diff --git a/packages/pug/test/markdown-it/index.test.js b/packages/pug/test/markdown-it/index.test.js
new file mode 100644
index 000000000..7ab82c8a1
--- /dev/null
+++ b/packages/pug/test/markdown-it/index.test.js
@@ -0,0 +1,13 @@
+const pug = require('../../');
+
+test('inline and include markdow-it should match ', () => {
+   const outputMarkdownInline = pug.renderFile(
+      __dirname + '/layout-markdown-inline.pug',
+   );
+
+   const outputMarkdownIncludes = pug.renderFile(
+      __dirname + '/layout-markdown-include.pug',
+   );
+
+   expect(outputMarkdownIncludes).toEqual(outputMarkdownInline);
+});
diff --git a/packages/pug/test/markdown-it/layout-markdown-include.pug b/packages/pug/test/markdown-it/layout-markdown-include.pug
new file mode 100644
index 000000000..6a776dafd
--- /dev/null
+++ b/packages/pug/test/markdown-it/layout-markdown-include.pug
@@ -0,0 +1 @@
+include:markdown-it(html=true) comment.md
\ No newline at end of file
diff --git a/packages/pug/test/markdown-it/layout-markdown-inline.pug b/packages/pug/test/markdown-it/layout-markdown-inline.pug
new file mode 100644
index 000000000..ee46c9c40
--- /dev/null
+++ b/packages/pug/test/markdown-it/layout-markdown-inline.pug
@@ -0,0 +1,2 @@
+:markdown-it(html=true)
+   <h1 id="myHeader">Hello World!</h1>
\ No newline at end of file

From 1f770d63ea12daf7eb1d83e8561fc4bb82df120b Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 18 Jun 2019 10:53:57 +0100
Subject: [PATCH 69/96] Create FUNDING.yml

---
 .github/FUNDING.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..25ef3d10e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: pug
+ko_fi: # Replace with a single Ko-fi username
+tidelift: npm/pug
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with a single custom sponsorship URL

From fa8d287ac7155e4e6dd56ff38f4495135659532a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2019 09:25:10 +0100
Subject: [PATCH 70/96] Bump stringstream from 0.0.5 to 0.0.6 (#3156)

Bumps [stringstream](https://github.com/mhart/StringStream) from 0.0.5 to 0.0.6.
- [Release notes](https://github.com/mhart/StringStream/releases)
- [Commits](https://github.com/mhart/StringStream/compare/v0.0.5...v0.0.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 81d9770e7..be1b419ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5265,8 +5265,9 @@ stringify-package@^1.0.0:
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
 
 stringstream@~0.0.4:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"

From 8aed002922ae870dc5231b8a7bf24570f33bbfb1 Mon Sep 17 00:00:00 2001
From: Max Rumsey <max@maxrumsey.xyz>
Date: Mon, 16 Sep 2019 22:11:19 +0800
Subject: [PATCH 71/96] feat: add 'each .. of ..' syntax to support all
 iterable objects (including Arrays) (#3179)

---
 packages/pug-code-gen/index.js                | 10 ++++++
 packages/pug-lexer/index.js                   | 34 +++++++++++++++++++
 .../test/check-lexer-functions.test.js        |  1 +
 packages/pug-parser/index.js                  | 15 ++++++++
 packages/pug-walk/index.js                    |  5 +++
 5 files changed, 65 insertions(+)

diff --git a/packages/pug-code-gen/index.js b/packages/pug-code-gen/index.js
index 6409d0ad0..5c45c6dbd 100644
--- a/packages/pug-code-gen/index.js
+++ b/packages/pug-code-gen/index.js
@@ -767,6 +767,16 @@ Compiler.prototype = {
     this.buf.push('  }\n}).call(this);\n');
   },
 
+  visitEachOf: function(each){
+    this.buf.push(''
+      + '// iterate ' + each.obj + '\n'
+      + 'for (const ' + each.val + ' of ' + each.obj + ') {\n')
+
+    this.visit(each.block, each);
+
+    this.buf.push('}\n');
+  },
+
   /**
    * Visit `attrs`.
    *
diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index 9ad073eac..9f84f2d7c 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -971,6 +971,39 @@ Lexer.prototype = {
     }
   },
 
+  /**
+   * EachOf.
+   */
+
+  eachOf: function() {
+    var captures;
+    if (captures = /^(?:each|for) (.*) of *([^\n]+)/.exec(this.input)) {
+      this.consume(captures[0].length);
+      var tok = this.tok('eachOf', captures[1]);
+      tok.value = captures[1];
+      this.incrementColumn(captures[0].length - captures[2].length);
+      this.assertExpression(captures[2])
+      tok.code = captures[2];
+      this.incrementColumn(captures[2].length);
+      this.tokens.push(this.tokEnd(tok));
+
+      if (!(/^[a-zA-Z_$][\w$]*$/.test(tok.value.trim()) || /^\[ *[a-zA-Z_$][\w$]* *\, *[a-zA-Z_$][\w$]* *\]$/.test(tok.value.trim()))) {
+        this.error(
+          'MALFORMED_EACH_OF_LVAL',
+          'The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).'
+        );
+      }
+      
+      return true;
+    }
+    if (captures = /^- *(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? +of +([^\n]+)/.exec(this.input)) {
+      this.error(
+        'MALFORMED_EACH',
+        'Pug each and for should not be prefixed with a dash ("-"). They are pug keywords and not part of JavaScript.'
+      );
+    }
+  },
+
   /**
    * Code.
    */
@@ -1485,6 +1518,7 @@ Lexer.prototype = {
       || this.callLexerFunction('mixin')
       || this.callLexerFunction('call')
       || this.callLexerFunction('conditional')
+      || this.callLexerFunction('eachOf')
       || this.callLexerFunction('each')
       || this.callLexerFunction('while')
       || this.callLexerFunction('tag')
diff --git a/packages/pug-lexer/test/check-lexer-functions.test.js b/packages/pug-lexer/test/check-lexer-functions.test.js
index b639eae7d..9ff5870e3 100644
--- a/packages/pug-lexer/test/check-lexer-functions.test.js
+++ b/packages/pug-lexer/test/check-lexer-functions.test.js
@@ -23,6 +23,7 @@ var lexerFunctions = {
   doctype: true,
   dot: true,
   each: true,
+  eachOf: true,
   eos: true,
   endInterpolation: true,
   extends: true,
diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index 9036ca3bf..54606315e 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -234,6 +234,8 @@ Parser.prototype = {
         return this.parseDot();
       case 'each':
         return this.parseEach();
+      case 'eachOf':
+        return this.parseEachOf();
       case 'code':
         return this.parseCode();
       case 'blockcode':
@@ -761,6 +763,19 @@ loop:
     return node;
   },
 
+  parseEachOf: function(){
+    var tok = this.expect('eachOf');
+    var node = {
+      type: 'EachOf',
+      obj: tok.code,
+      val: tok.val,
+      block: this.block(),
+      line: tok.loc.start.line,
+      column: tok.loc.start.column,
+      filename: this.filename
+    };
+    return node;
+  },
   /**
    * 'extends' name
    */
diff --git a/packages/pug-walk/index.js b/packages/pug-walk/index.js
index 94f1aba88..138aef0b3 100644
--- a/packages/pug-walk/index.js
+++ b/packages/pug-walk/index.js
@@ -56,6 +56,11 @@ function walkAST(ast, before, after, options) {
         ast.alternate = walkAST(ast.alternate, before, after, options);
       }
       break;
+    case 'EachOf':
+      if (ast.block) {
+        ast.block = walkAST(ast.block, before, after, options);
+      }
+      break;
     case 'Conditional':
       if (ast.consequent) {
         ast.consequent = walkAST(ast.consequent, before, after, options);

From 48c69c95fa636147bc5b79e0a97a2672e3a6f31c Mon Sep 17 00:00:00 2001
From: Max Rumsey <max@maxrumsey.xyz>
Date: Tue, 17 Sep 2019 16:34:17 +0800
Subject: [PATCH 72/96] test: each .. of .. test cases (#3183)

---
 .../eachOf/__snapshots__/index.test.js.snap   |  5 ++
 packages/pug/test/eachOf/error/left-side.pug  |  3 ++
 .../pug/test/eachOf/error/no-brackets.pug     |  3 ++
 packages/pug/test/eachOf/error/one-val.pug    |  3 ++
 packages/pug/test/eachOf/error/right-side.pug |  3 ++
 packages/pug/test/eachOf/index.test.js        | 52 +++++++++++++++++++
 packages/pug/test/eachOf/passing/brackets.pug |  3 ++
 .../pug/test/eachOf/passing/no-brackets.pug   |  3 ++
 8 files changed, 75 insertions(+)
 create mode 100644 packages/pug/test/eachOf/__snapshots__/index.test.js.snap
 create mode 100644 packages/pug/test/eachOf/error/left-side.pug
 create mode 100644 packages/pug/test/eachOf/error/no-brackets.pug
 create mode 100644 packages/pug/test/eachOf/error/one-val.pug
 create mode 100644 packages/pug/test/eachOf/error/right-side.pug
 create mode 100644 packages/pug/test/eachOf/index.test.js
 create mode 100644 packages/pug/test/eachOf/passing/brackets.pug
 create mode 100644 packages/pug/test/eachOf/passing/no-brackets.pug

diff --git a/packages/pug/test/eachOf/__snapshots__/index.test.js.snap b/packages/pug/test/eachOf/__snapshots__/index.test.js.snap
new file mode 100644
index 000000000..b8983356f
--- /dev/null
+++ b/packages/pug/test/eachOf/__snapshots__/index.test.js.snap
@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Proper Usage Brackets 1`] = `"<li>a</li><li>b</li><li>foo</li><li>bar</li>"`;
+
+exports[`Proper Usage No Brackets 1`] = `"<li>a</li><li>b</li><li>foo</li><li>bar</li>"`;
diff --git a/packages/pug/test/eachOf/error/left-side.pug b/packages/pug/test/eachOf/error/left-side.pug
new file mode 100644
index 000000000..b2a081d2f
--- /dev/null
+++ b/packages/pug/test/eachOf/error/left-side.pug
@@ -0,0 +1,3 @@
+each [key, val of users
+  li= key
+  li= val
diff --git a/packages/pug/test/eachOf/error/no-brackets.pug b/packages/pug/test/eachOf/error/no-brackets.pug
new file mode 100644
index 000000000..83fbbffc0
--- /dev/null
+++ b/packages/pug/test/eachOf/error/no-brackets.pug
@@ -0,0 +1,3 @@
+each key, val of users
+  li= key
+  li= val
diff --git a/packages/pug/test/eachOf/error/one-val.pug b/packages/pug/test/eachOf/error/one-val.pug
new file mode 100644
index 000000000..0c6ff7006
--- /dev/null
+++ b/packages/pug/test/eachOf/error/one-val.pug
@@ -0,0 +1,3 @@
+each [key] of users
+  li= key
+  li= val
diff --git a/packages/pug/test/eachOf/error/right-side.pug b/packages/pug/test/eachOf/error/right-side.pug
new file mode 100644
index 000000000..6a6aab530
--- /dev/null
+++ b/packages/pug/test/eachOf/error/right-side.pug
@@ -0,0 +1,3 @@
+each key, val] of users
+  li= key
+  li= val
diff --git a/packages/pug/test/eachOf/index.test.js b/packages/pug/test/eachOf/index.test.js
new file mode 100644
index 000000000..5faf59f34
--- /dev/null
+++ b/packages/pug/test/eachOf/index.test.js
@@ -0,0 +1,52 @@
+const pug = require('../../');
+
+describe('Inproper Usage', () => {
+  test('Only left-side bracket', () => {
+    expect(
+      () => pug.compileFile(
+        __dirname + '/error/left-side.pug'
+      )
+    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
+  })
+  test('Only right-side bracket', () => {
+    expect(
+      () => pug.compileFile(
+        __dirname + '/error/right-side.pug'
+      )
+    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
+  })
+  test('Only one value inside brackets', () => {
+    expect(
+      () => pug.compileFile(
+        __dirname + '/error/one-val.pug'
+      )
+    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
+  })
+  test('No brackets', () => {
+    expect(
+      () => pug.compileFile(
+        __dirname + '/error/no-brackets.pug'
+      )
+    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
+  })
+})
+describe('Proper Usage', () => {
+  test('Brackets', () => {
+    const html = pug.renderFile(
+      __dirname + '/passing/brackets.pug',
+      {
+        users: new Map([['a', 'b'], ['foo', 'bar']])
+      }
+    )
+    expect(html).toMatchSnapshot();
+  })
+  test('No Brackets', () => {
+    const html = pug.renderFile(
+      __dirname + '/passing/no-brackets.pug',
+      {
+        users: new Map([['a', 'b'], ['foo', 'bar']])
+      }
+    )
+    expect(html).toMatchSnapshot();
+  })
+})
diff --git a/packages/pug/test/eachOf/passing/brackets.pug b/packages/pug/test/eachOf/passing/brackets.pug
new file mode 100644
index 000000000..b8193d538
--- /dev/null
+++ b/packages/pug/test/eachOf/passing/brackets.pug
@@ -0,0 +1,3 @@
+each [key, val] of users
+  li= key
+  li= val
diff --git a/packages/pug/test/eachOf/passing/no-brackets.pug b/packages/pug/test/eachOf/passing/no-brackets.pug
new file mode 100644
index 000000000..880fee5c7
--- /dev/null
+++ b/packages/pug/test/eachOf/passing/no-brackets.pug
@@ -0,0 +1,3 @@
+each data of users
+  li= data[0]
+  li= data[1]

From e1b66206064cfba5f4b7cd3fb86c9f1e41c07ef2 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 4 Nov 2019 15:44:57 +0000
Subject: [PATCH 73/96] chore: add security policy

---
 SECURITY.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..bd3a6912a
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+| Version  | Supported          |
+| -------- | ------------------ |
+| ^2.0.4   | :white_check_mark: |
+| <2.0.4   | :x:                |
+
+## Reporting a Vulnerability
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

From c915b1c47a041b47f36e8f612f98187f09038241 Mon Sep 17 00:00:00 2001
From: Exalyon <Exalyon@users.noreply.github.com>
Date: Mon, 4 Nov 2019 17:48:57 +0100
Subject: [PATCH 74/96] docs: Fix typo on the last line of dependencies:
 pug-walk instead of pug-error (#3194)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef9cd59c9..a0bd18ec2 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Full documentation is at [pugjs.org](https://pugjs.org/)
 | pug-parser | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-parser)](https://david-dm.org/pugjs/pug?path=packages/pug-parser&type=dev) |
 | pug-runtime | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-runtime)](https://david-dm.org/pugjs/pug?path=packages/pug-runtime&type=dev) |
 | pug-strip-comments | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-strip-comments)](https://david-dm.org/pugjs/pug?path=packages/pug-strip-comments&type=dev) |
-| pug-error | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk&type=dev) |
+| pug-walk | [![Dependencies Status](https://david-dm.org/pugjs/pug/status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk)      |    [![Dependencies Status](https://david-dm.org/pugjs/pug/dev-status.svg?path=packages/pug-walk)](https://david-dm.org/pugjs/pug?path=packages/pug-walk&type=dev) |
 
 ## Rename from "Jade"
 

From 201b9c78431e172dc90a6d258af982e2d1191da8 Mon Sep 17 00:00:00 2001
From: Yashar Fakhari <YasharF@users.noreply.github.com>
Date: Mon, 16 Dec 2019 08:33:23 -0800
Subject: [PATCH 75/96] Update dependencies (#3189)

---
 packages/pug-attrs/package.json          | 2 +-
 packages/pug-code-gen/package.json       | 4 ++--
 packages/pug-filters/package.json        | 2 +-
 packages/pug-lexer/package.json          | 2 +-
 packages/pug-strip-comments/package.json | 2 +-
 packages/pug/package.json                | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/pug-attrs/package.json b/packages/pug-attrs/package.json
index e4b465dd8..10b7bfdf1 100644
--- a/packages/pug-attrs/package.json
+++ b/packages/pug-attrs/package.json
@@ -6,7 +6,7 @@
     "pug"
   ],
   "dependencies": {
-    "constantinople": "^3.0.1",
+    "constantinople": "^4.0.1",
     "js-stringify": "^1.0.1",
     "pug-runtime": "^2.0.5"
   },
diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index acc3b97d7..41e0b5870 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -6,13 +6,13 @@
     "pug"
   ],
   "dependencies": {
-    "constantinople": "^3.1.2",
+    "constantinople": "^4.0.1",
     "doctypes": "^1.1.0",
     "js-stringify": "^1.0.1",
     "pug-attrs": "^2.0.4",
     "pug-error": "^1.3.3",
     "pug-runtime": "^2.0.5",
-    "void-elements": "^2.0.1",
+    "void-elements": "^3.1.0",
     "with": "^5.0.0"
   },
   "files": [
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 922577ae5..fd54550cd 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -7,7 +7,7 @@
   ],
   "dependencies": {
     "clean-css": "^4.1.11",
-    "constantinople": "^3.0.1",
+    "constantinople": "^4.0.1",
     "jstransformer": "1.0.0",
     "pug-error": "^1.3.3",
     "pug-walk": "^1.1.8",
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index b4a3cb131..1aa944a6c 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -11,7 +11,7 @@
     "pug-error": "^1.3.3"
   },
   "devDependencies": {
-    "acorn": "^3.0.4"
+    "acorn": "^7.1.0"
   },
   "files": [
     "index.js"
diff --git a/packages/pug-strip-comments/package.json b/packages/pug-strip-comments/package.json
index ace9f8ab0..1824c9d48 100644
--- a/packages/pug-strip-comments/package.json
+++ b/packages/pug-strip-comments/package.json
@@ -9,7 +9,7 @@
     "pug-error": "^1.3.3"
   },
   "devDependencies": {
-    "line-json": "^1.0.0"
+    "line-json": "^2.0.0"
   },
   "files": [
     "index.js"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index cee45620c..58286e486 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -44,7 +44,7 @@
     "jstransformer-uglify-js": "^1.1.1",
     "jstransformer-verbatim": "^1.0.0",
     "mkdirp": "^0.5.1",
-    "rimraf": "^2.2.8",
+    "rimraf": "^3.0.0",
     "uglify-js": "github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
   },
   "files": [

From 27d91bec9c912305745244e7d42040097ae5fd38 Mon Sep 17 00:00:00 2001
From: Shinigami <chrissi92@hotmail.de>
Date: Sun, 26 Apr 2020 06:33:32 +0200
Subject: [PATCH 76/96] Add Prettier Plugin link (#3206)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a0bd18ec2..779295b31 100644
--- a/README.md
+++ b/README.md
@@ -210,6 +210,7 @@ Embedded view engines for frameworks:
   - [pug2php](https://github.com/SE7ENSKY/jade2php) converter
   - [Pug Server](https://github.com/ctrlaltdev/pug-server) Ideal for building local prototypes apart from any application
   - [cache-pug-templates](https://github.com/ladjs/cache-pug-templates) Cache Pug templates for [Lad](https://github.com/ladjs/lad)/[Koa](https://github.com/koajs/koa)/[Express](https://github.com/expressjs/express)/[Connect](https://github.com/senchalabs/connect) with [Redis](https://redis.io)
+  - [Prettier Plugin](https://github.com/prettier/plugin-pug)
 
 
 ## Backers

From 5741771e8b5cbdf47e1bdf660a72f28546aee0a9 Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Sat, 2 May 2020 01:49:16 +1000
Subject: [PATCH 77/96] docs: Fix simple typo, overriden -> overridden (#3231)

There is a small typo in packages/pug-load/README.md.

Should read `overridden` rather than `overriden`.
---
 packages/pug-load/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pug-load/README.md b/packages/pug-load/README.md
index 5d19340d6..2c16f26ec 100644
--- a/packages/pug-load/README.md
+++ b/packages/pug-load/README.md
@@ -52,7 +52,7 @@ This function is not meant to be called from outside of `pug-load`, but rather f
 
 ### `load.validateOptions(options)`
 
-Callback used `pug-load` to ensure the options object is valid. If your overriden `load.resolve` or `load.read` uses a different `options` scheme, you will need to override this function as well.
+Callback used `pug-load` to ensure the options object is valid. If your overridden `load.resolve` or `load.read` uses a different `options` scheme, you will need to override this function as well.
 
 This function is not meant to be called from outside of `pug-load`, but rather for you to override.
 

From 3920013fcbd0946339839e2d8d9108efda1180c7 Mon Sep 17 00:00:00 2001
From: zackschuster <email+github@zackschuster.com>
Date: Fri, 1 May 2020 08:56:42 -0700
Subject: [PATCH 78/96] deps: upgrade to latest versions (#3184)

---
 .editorconfig                                 |    6 +-
 .gitignore                                    |   10 +-
 .prettierrc.js                                |   14 +
 package.json                                  |   17 +-
 packages/pug-attrs/package.json               |    2 +-
 packages/pug-code-gen/package.json            |    4 +-
 packages/pug-filters/package.json             |   14 +-
 packages/pug-lexer/package.json               |    5 +-
 .../test/check-lexer-functions.test.js        |    2 +-
 packages/pug-load/package.json                |    2 +-
 packages/pug-parser/package.json              |    2 +-
 packages/pug/package.json                     |    4 +-
 .../pug/test/__snapshots__/pug.test.js.snap   |   40 +-
 packages/pug/test/pug.test.js                 |    2 +-
 scripts/prettier-javascript-serializer.js     |   12 +-
 yarn.lock                                     | 6500 ++++++++++-------
 16 files changed, 3943 insertions(+), 2693 deletions(-)
 create mode 100644 .prettierrc.js

diff --git a/.editorconfig b/.editorconfig
index 78c6ddee2..45c47a565 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,10 @@
 root = true
 
 [*]
-end_of_line = lf
-insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 2
+tab_width = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index e09104305..706b9f9f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,15 @@ node_modules
 lib-cov
 coverage
 cov-pt*
-npm-debug.log
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.patch
+*.pid
+*.gz
 **/test/output*
 **/test/temp
 .release.json
-lerna-debug.log
 package-lock.json
diff --git a/.prettierrc.js b/.prettierrc.js
new file mode 100644
index 000000000..40a818f16
--- /dev/null
+++ b/.prettierrc.js
@@ -0,0 +1,14 @@
+module.exports = {
+  bracketSpacing: false,
+  singleQuote: true,
+  trailingComma: 'all',
+  overrides: [
+    {
+      files: '*.js',
+      options: {
+        parser: 'babel',
+        trailingComma: 'es5',
+      },
+    },
+  ],
+};
diff --git a/package.json b/package.json
index 4b0777a91..6172c2cc0 100644
--- a/package.json
+++ b/package.json
@@ -2,16 +2,17 @@
   "name": "pug-monorepo",
   "private": true,
   "devDependencies": {
-    "coveralls": "3.0.2",
-    "jest": "24.0.0",
-    "lerna": "3.10.8",
-    "prettier": "^1.3.1"
+    "coveralls": "3.0.9",
+    "jest": "24.9.0",
+    "lerna": "3.20.2",
+    "prettier": "1.19.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/pugjs/pug.git"
   },
   "scripts": {
+    "format": "prettier --ignore-path .gitignore --write './**/*.js'",
     "bootstrap": "lerna bootstrap",
     "clean": "lerna clean",
     "release": "lerna publish",
@@ -31,5 +32,11 @@
   "license": "MIT",
   "workspaces": [
     "packages/*"
-  ]
+  ],
+  "resolutions": {
+    "jstransformer-markdown-it": "2.0.0",
+    "mkdirp": "0.5.1",
+    "shallow-clone": "2.0.0",
+    "stylus": "0.54.5"
+  }
 }
diff --git a/packages/pug-attrs/package.json b/packages/pug-attrs/package.json
index 10b7bfdf1..615713f63 100644
--- a/packages/pug-attrs/package.json
+++ b/packages/pug-attrs/package.json
@@ -7,7 +7,7 @@
   ],
   "dependencies": {
     "constantinople": "^4.0.1",
-    "js-stringify": "^1.0.1",
+    "js-stringify": "^1.0.2",
     "pug-runtime": "^2.0.5"
   },
   "files": [
diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index 41e0b5870..42507a6eb 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -8,12 +8,12 @@
   "dependencies": {
     "constantinople": "^4.0.1",
     "doctypes": "^1.1.0",
-    "js-stringify": "^1.0.1",
+    "js-stringify": "^1.0.2",
     "pug-attrs": "^2.0.4",
     "pug-error": "^1.3.3",
     "pug-runtime": "^2.0.5",
     "void-elements": "^3.1.0",
-    "with": "^5.0.0"
+    "with": "^6.0.0"
   },
   "files": [
     "index.js"
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index fd54550cd..f0166f4d5 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -6,22 +6,22 @@
     "pug"
   ],
   "dependencies": {
-    "clean-css": "^4.1.11",
+    "clean-css": "^4.2.3",
     "constantinople": "^4.0.1",
     "jstransformer": "1.0.0",
     "pug-error": "^1.3.3",
     "pug-walk": "^1.1.8",
-    "resolve": "^1.1.6",
+    "resolve": "^1.15.1",
     "uglify-js": "^2.6.1"
   },
   "devDependencies": {
     "get-repo": "^1.0.0",
     "jstransformer-cdata": "^1.0.0",
-    "jstransformer-coffee-script": "^1.0.0",
-    "jstransformer-less": "^2.1.0",
-    "jstransformer-markdown-it": "^1.0.0",
-    "jstransformer-stylus": "^1.0.0",
-    "jstransformer-uglify-js": "^1.1.1",
+    "jstransformer-coffee-script": "^1.1.1",
+    "jstransformer-less": "^2.3.0",
+    "jstransformer-markdown-it": "^2.0.0",
+    "jstransformer-stylus": "^1.5.0",
+    "jstransformer-uglify-js": "^1.2.0",
     "pug-lexer": "^4.1.0",
     "pug-load": "^2.0.12",
     "pug-parser": "^5.0.1"
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index 1aa944a6c..c8b8f420b 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -6,12 +6,13 @@
     "pug"
   ],
   "dependencies": {
-    "character-parser": "^2.1.1",
+    "character-parser": "^2.2.0",
     "is-expression": "^3.0.0",
     "pug-error": "^1.3.3"
   },
   "devDependencies": {
-    "acorn": "^7.1.0"
+    "acorn": "^7.1.1",
+    "acorn-walk": "^7.1.1"
   },
   "files": [
     "index.js"
diff --git a/packages/pug-lexer/test/check-lexer-functions.test.js b/packages/pug-lexer/test/check-lexer-functions.test.js
index 9ff5870e3..49ec401e1 100644
--- a/packages/pug-lexer/test/check-lexer-functions.test.js
+++ b/packages/pug-lexer/test/check-lexer-functions.test.js
@@ -1,6 +1,6 @@
 var fs = require('fs');
 var acorn = require('acorn');
-var walk = require('acorn/dist/walk');
+var walk = require('acorn-walk');
 
 var hadErrors = false;
 
diff --git a/packages/pug-load/package.json b/packages/pug-load/package.json
index 97f805156..74ead87d2 100644
--- a/packages/pug-load/package.json
+++ b/packages/pug-load/package.json
@@ -6,7 +6,7 @@
     "pug"
   ],
   "dependencies": {
-    "object-assign": "^4.1.0",
+    "object-assign": "^4.1.1",
     "pug-walk": "^1.1.8"
   },
   "devDependencies": {
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index e97f25ca8..3873172a9 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -7,7 +7,7 @@
   ],
   "dependencies": {
     "pug-error": "^1.3.3",
-    "token-stream": "0.0.1"
+    "token-stream": "1.0.0"
   },
   "devDependencies": {
     "get-repo": "^1.0.0"
diff --git a/packages/pug/package.json b/packages/pug/package.json
index 58286e486..a5e3360c3 100644
--- a/packages/pug/package.json
+++ b/packages/pug/package.json
@@ -39,12 +39,12 @@
     "jstransformer-cdata": "^1.0.0",
     "jstransformer-coffee-script": "^1.0.0",
     "jstransformer-less": "^2.1.0",
-    "jstransformer-markdown-it": "^1.0.0",
+    "jstransformer-markdown-it": "^2.0.0",
     "jstransformer-stylus": "^1.0.0",
     "jstransformer-uglify-js": "^1.1.1",
     "jstransformer-verbatim": "^1.0.0",
     "mkdirp": "^0.5.1",
-    "rimraf": "^3.0.0",
+    "rimraf": "^3.0.2",
     "uglify-js": "github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
   },
   "files": [
diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
index a27fe2cca..0ce7c83c5 100644
--- a/packages/pug/test/__snapshots__/pug.test.js.snap
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false 1`] = `
-"var pug = require(\\"pug-runtime\\");
+"var pug = require('pug-runtime');
 function template(locals) {
-  var pug_html = \\"\\",
+  var pug_html = '',
     pug_mixins = {},
     pug_interp;
   var pug_debug_filename, pug_debug_line;
@@ -14,8 +14,8 @@ function template(locals) {
     pug_debug_line = 1;
     pug_html =
       pug_html +
-      pug.escape(null == (pug_interp = self.foo) ? \\"\\" : pug_interp) +
-      \\"\\\\u003C\\\\u002Fdiv\\\\u003E\\";
+      pug.escape(null == (pug_interp = self.foo) ? '' : pug_interp) +
+      '\\\\u003C\\\\u002Fdiv\\\\u003E';
   } catch (err) {
     pug.rethrow(err, pug_debug_filename, pug_debug_line);
   }
@@ -27,26 +27,26 @@ module.exports = template;
 
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true 1`] = `
 "function pug_escape(e) {
-  var a = \\"\\" + e,
+  var a = '' + e,
     t = pug_match_html.exec(a);
   if (!t) return e;
   var r,
     c,
     n,
-    s = \\"\\";
+    s = '';
   for (r = t.index, c = 0; r < a.length; r++) {
     switch (a.charCodeAt(r)) {
       case 34:
-        n = \\"&quot;\\";
+        n = '&quot;';
         break;
       case 38:
-        n = \\"&amp;\\";
+        n = '&amp;';
         break;
       case 60:
-        n = \\"&lt;\\";
+        n = '&lt;';
         break;
       case 62:
-        n = \\"&gt;\\";
+        n = '&gt;';
         break;
       default:
         continue;
@@ -58,30 +58,30 @@ exports[`pug .compileClient() should support module syntax in pug.compileClient(
 var pug_match_html = /[\\"&<>]/;
 function pug_rethrow(n, e, r, t) {
   if (!(n instanceof Error)) throw n;
-  if (!((\\"undefined\\" == typeof window && e) || t))
-    throw ((n.message += \\" on line \\" + r), n);
+  if (!(('undefined' == typeof window && e) || t))
+    throw ((n.message += ' on line ' + r), n);
   try {
-    t = t || require(\\"fs\\").readFileSync(e, \\"utf8\\");
+    t = t || require('fs').readFileSync(e, 'utf8');
   } catch (e) {
     pug_rethrow(n, null, r);
   }
   var i = 3,
-    a = t.split(\\"\\\\n\\"),
+    a = t.split('\\\\n'),
     o = Math.max(r - i, 0),
     h = Math.min(a.length, r + i),
     i = a
       .slice(o, h)
       .map(function(n, e) {
         var t = e + o + 1;
-        return (t == r ? \\"  > \\" : \\"    \\") + t + \\"| \\" + n;
+        return (t == r ? '  > ' : '    ') + t + '| ' + n;
       })
-      .join(\\"\\\\n\\");
+      .join('\\\\n');
   throw ((n.path = e),
-  (n.message = (e || \\"Pug\\") + \\":\\" + r + \\"\\\\n\\" + i + \\"\\\\n\\\\n\\" + n.message),
+  (n.message = (e || 'Pug') + ':' + r + '\\\\n' + i + '\\\\n\\\\n' + n.message),
   n);
 }
 function template(locals) {
-  var pug_html = \\"\\",
+  var pug_html = '',
     pug_mixins = {},
     pug_interp;
   var pug_debug_filename, pug_debug_line;
@@ -92,8 +92,8 @@ function template(locals) {
     pug_debug_line = 1;
     pug_html =
       pug_html +
-      pug_escape(null == (pug_interp = self.foo) ? \\"\\" : pug_interp) +
-      \\"\\\\u003C\\\\u002Fdiv\\\\u003E\\";
+      pug_escape(null == (pug_interp = self.foo) ? '' : pug_interp) +
+      '\\\\u003C\\\\u002Fdiv\\\\u003E';
   } catch (err) {
     pug_rethrow(err, pug_debug_filename, pug_debug_line);
   }
diff --git a/packages/pug/test/pug.test.js b/packages/pug/test/pug.test.js
index 228dadbd9..3327b1a9e 100644
--- a/packages/pug/test/pug.test.js
+++ b/packages/pug/test/pug.test.js
@@ -31,7 +31,7 @@ describe('pug', function(){
     });
 
     it('should support Buffers', function(){
-      assert.equal('<p>foo</p>', pug.render(new Buffer('p foo')));
+      assert.equal('<p>foo</p>', pug.render(Buffer.from('p foo')));
     });
 
     it('should support line endings', function(){
diff --git a/scripts/prettier-javascript-serializer.js b/scripts/prettier-javascript-serializer.js
index 4a0630a22..0f56b1d1f 100644
--- a/scripts/prettier-javascript-serializer.js
+++ b/scripts/prettier-javascript-serializer.js
@@ -1,6 +1,16 @@
+const fs = require('fs');
+const path = require('path');
 const prettier = require('prettier');
 
-const prettierOptions = {} // optional
+const prettierrc = require('../.prettierrc.js');
+const prettierOptions = Object.assign(
+  {
+    trailingComma:
+      /** @type {import('prettier').ParserOptions['trailingComma']} */ ('es5'),
+  },
+  prettierrc,
+  prettierrc.overrides[0].options
+);
 
 // filename serializer that removes the basedir
 module.exports = {
diff --git a/yarn.lock b/yarn.lock
index be1b419ea..774e87e83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,769 +2,1358 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
   dependencies:
-    "@babel/highlight" "^7.0.0"
+    "@babel/highlight" "^7.8.3"
 
 "@babel/core@^7.1.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
-    "@babel/helpers" "^7.2.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/template" "^7.2.2"
-    "@babel/traverse" "^7.2.2"
-    "@babel/types" "^7.2.2"
-    convert-source-map "^1.1.0"
+  version "7.8.7"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
+  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.8.7"
+    "@babel/helpers" "^7.8.4"
+    "@babel/parser" "^7.8.7"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.7"
+    convert-source-map "^1.7.0"
     debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
     json5 "^2.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.13"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.0.0", "@babel/generator@^7.2.2":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.0.tgz#f663838cd7b542366de3aa608a657b8ccb2a99eb"
+"@babel/generator@^7.4.0", "@babel/generator@^7.8.6", "@babel/generator@^7.8.7":
+  version "7.8.8"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e"
+  integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==
   dependencies:
-    "@babel/types" "^7.3.0"
+    "@babel/types" "^7.8.7"
     jsesc "^2.5.1"
-    lodash "^4.17.10"
+    lodash "^4.17.13"
     source-map "^0.5.0"
-    trim-right "^1.0.1"
 
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+"@babel/helper-function-name@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
+  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+"@babel/helper-get-function-arity@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.8.3"
 
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+"@babel/helper-split-export-declaration@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.2.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.3.1.tgz#949eec9ea4b45d3210feb7dc1c22db664c9e44b9"
+"@babel/helpers@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
+  integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
   dependencies:
-    "@babel/template" "^7.1.2"
-    "@babel/traverse" "^7.1.5"
-    "@babel/types" "^7.3.0"
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.8.4"
+    "@babel/types" "^7.8.3"
 
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+"@babel/highlight@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
+  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.3.1.tgz#8f4ffd45f779e6132780835ffa7a215fa0b2d181"
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7":
+  version "7.8.8"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4"
+  integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==
 
 "@babel/plugin-syntax-object-rest-spread@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/template@^7.4.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
+  version "7.8.6"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
+  integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.8.6"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.8.6"
+    "@babel/types" "^7.8.6"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.6.1", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
+  integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
+    esutils "^2.0.2"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
 
-"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2":
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
+"@evocateur/libnpmaccess@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
+  integrity sha512-KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.2.3"
-    "@babel/types" "^7.2.2"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.10"
+    "@evocateur/npm-registry-fetch" "^4.0.0"
+    aproba "^2.0.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.3.0.tgz#61dc0b336a93badc02bf5f69c4cd8e1353f2ffc0"
+"@evocateur/libnpmpublish@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.npmjs.org/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz#55df09d2dca136afba9c88c759ca272198db9f1a"
+  integrity sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.10"
-    to-fast-properties "^2.0.0"
+    "@evocateur/npm-registry-fetch" "^4.0.0"
+    aproba "^2.0.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    lodash.clonedeep "^4.5.0"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    semver "^5.5.1"
+    ssri "^6.0.1"
 
-"@lerna/add@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.10.6.tgz#6f2c6b26eb905c40fef4180f3ffa34ad9dbb860b"
+"@evocateur/npm-registry-fetch@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz#8c4c38766d8d32d3200fcb0a83f064b57365ed66"
+  integrity sha512-k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g==
   dependencies:
-    "@lerna/bootstrap" "3.10.6"
-    "@lerna/command" "3.10.6"
-    "@lerna/filter-options" "3.10.6"
-    "@lerna/npm-conf" "3.7.0"
-    "@lerna/validation-error" "3.6.0"
-    dedent "^0.7.0"
-    libnpm "^2.0.1"
-    p-map "^1.2.0"
-    semver "^5.5.0"
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    npm-package-arg "^6.1.0"
+    safe-buffer "^5.1.2"
+
+"@evocateur/pacote@^9.6.3":
+  version "9.6.5"
+  resolved "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.5.tgz#33de32ba210b6f17c20ebab4d497efc6755f4ae5"
+  integrity sha512-EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w==
+  dependencies:
+    "@evocateur/npm-registry-fetch" "^4.0.0"
+    bluebird "^3.5.3"
+    cacache "^12.0.3"
+    chownr "^1.1.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.4"
+    infer-owner "^1.0.4"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.5.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.4.4"
+    npm-pick-manifest "^3.0.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.3"
+    safe-buffer "^5.2.0"
+    semver "^5.7.0"
+    ssri "^6.0.1"
+    tar "^4.4.10"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
 
-"@lerna/batch-packages@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.10.6.tgz#2d6dfc9be13ea4da49244dd84bfcd46c3d62f4d0"
-  dependencies:
-    "@lerna/package-graph" "3.10.6"
-    "@lerna/validation-error" "3.6.0"
-    libnpm "^2.0.1"
-
-"@lerna/bootstrap@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.10.6.tgz#d250baa9cfe9026c4f78e6cf7c9761a90b24e363"
-  dependencies:
-    "@lerna/batch-packages" "3.10.6"
-    "@lerna/command" "3.10.6"
-    "@lerna/filter-options" "3.10.6"
-    "@lerna/has-npm-version" "3.10.0"
-    "@lerna/npm-install" "3.10.0"
-    "@lerna/package-graph" "3.10.6"
-    "@lerna/pulse-till-done" "3.7.1"
-    "@lerna/rimraf-dir" "3.10.0"
-    "@lerna/run-lifecycle" "3.10.5"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/symlink-binary" "3.10.0"
-    "@lerna/symlink-dependencies" "3.10.0"
-    "@lerna/validation-error" "3.6.0"
+"@jest/console@^24.7.1", "@jest/console@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
+  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+  dependencies:
+    "@jest/source-map" "^24.9.0"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
+"@jest/core@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4"
+  integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/reporters" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-changed-files "^24.9.0"
+    jest-config "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-resolve-dependencies "^24.9.0"
+    jest-runner "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    jest-watcher "^24.9.0"
+    micromatch "^3.1.10"
+    p-each-series "^1.0.0"
+    realpath-native "^1.1.0"
+    rimraf "^2.5.4"
+    slash "^2.0.0"
+    strip-ansi "^5.0.0"
+
+"@jest/environment@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18"
+  integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==
+  dependencies:
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+
+"@jest/fake-timers@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
+  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-mock "^24.9.0"
+
+"@jest/reporters@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43"
+  integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==
+  dependencies:
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    istanbul-lib-coverage "^2.0.2"
+    istanbul-lib-instrument "^3.0.1"
+    istanbul-lib-report "^2.0.4"
+    istanbul-lib-source-maps "^3.0.1"
+    istanbul-reports "^2.2.6"
+    jest-haste-map "^24.9.0"
+    jest-resolve "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.6.0"
+    node-notifier "^5.4.2"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+    string-length "^2.0.0"
+
+"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
+  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.1.15"
+    source-map "^0.6.0"
+
+"@jest/test-result@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
+  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+  dependencies:
+    "@jest/console" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+
+"@jest/test-sequencer@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31"
+  integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==
+  dependencies:
+    "@jest/test-result" "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-runner "^24.9.0"
+    jest-runtime "^24.9.0"
+
+"@jest/transform@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
+  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^24.9.0"
+    babel-plugin-istanbul "^5.1.0"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.15"
+    jest-haste-map "^24.9.0"
+    jest-regex-util "^24.9.0"
+    jest-util "^24.9.0"
+    micromatch "^3.1.10"
+    pirates "^4.0.1"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "2.4.1"
+
+"@jest/types@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
+  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^13.0.0"
+
+"@lerna/add@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/add/-/add-3.20.0.tgz#bea7edf36fc93fb72ec34cb9ba854c48d4abf309"
+  integrity sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==
+  dependencies:
+    "@evocateur/pacote" "^9.6.3"
+    "@lerna/bootstrap" "3.20.0"
+    "@lerna/command" "3.18.5"
+    "@lerna/filter-options" "3.20.0"
+    "@lerna/npm-conf" "3.16.0"
+    "@lerna/validation-error" "3.13.0"
+    dedent "^0.7.0"
+    npm-package-arg "^6.1.0"
+    p-map "^2.1.0"
+    semver "^6.2.0"
+
+"@lerna/bootstrap@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.20.0.tgz#635d71046830f208e851ab429a63da1747589e37"
+  integrity sha512-Wylullx3uthKE7r4izo09qeRGL20Y5yONlQEjPCfnbxCC2Elu+QcPu4RC6kqKQ7b+g7pdC3OOgcHZjngrwr5XQ==
+  dependencies:
+    "@lerna/command" "3.18.5"
+    "@lerna/filter-options" "3.20.0"
+    "@lerna/has-npm-version" "3.16.5"
+    "@lerna/npm-install" "3.16.5"
+    "@lerna/package-graph" "3.18.5"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/rimraf-dir" "3.16.5"
+    "@lerna/run-lifecycle" "3.16.2"
+    "@lerna/run-topologically" "3.18.5"
+    "@lerna/symlink-binary" "3.17.0"
+    "@lerna/symlink-dependencies" "3.17.0"
+    "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
-    get-port "^3.2.0"
-    libnpm "^2.0.1"
-    multimatch "^2.1.0"
+    get-port "^4.2.0"
+    multimatch "^3.0.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
     p-finally "^1.0.0"
-    p-map "^1.2.0"
+    p-map "^2.1.0"
     p-map-series "^1.0.0"
     p-waterfall "^1.0.0"
     read-package-tree "^5.1.6"
-    semver "^5.5.0"
+    semver "^6.2.0"
 
-"@lerna/changed@3.10.8":
-  version "3.10.8"
-  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.10.8.tgz#7ed17a00c4ca0f6437ce9f7d4925d5e779b8553c"
+"@lerna/changed@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/changed/-/changed-3.20.0.tgz#66b97ebd6c8f8d207152ee524a0791846a9097ae"
+  integrity sha512-+hzMFSldbRPulZ0vbKk6RD9f36gaH3Osjx34wrrZ62VB4pKmjyuS/rxVYkCA3viPLHoiIw2F8zHM5BdYoDSbjw==
   dependencies:
-    "@lerna/collect-updates" "3.10.1"
-    "@lerna/command" "3.10.6"
-    "@lerna/listable" "3.10.6"
-    "@lerna/output" "3.6.0"
-    "@lerna/version" "3.10.8"
+    "@lerna/collect-updates" "3.20.0"
+    "@lerna/command" "3.18.5"
+    "@lerna/listable" "3.18.5"
+    "@lerna/output" "3.13.0"
 
-"@lerna/check-working-tree@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.10.0.tgz#5ed9f2c5c942bee92afcd8cb5361be44ed0251e3"
+"@lerna/check-working-tree@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.16.5.tgz#b4f8ae61bb4523561dfb9f8f8d874dd46bb44baa"
+  integrity sha512-xWjVBcuhvB8+UmCSb5tKVLB5OuzSpw96WEhS2uz6hkWVa/Euh1A0/HJwn2cemyK47wUrCQXtczBUiqnq9yX5VQ==
   dependencies:
-    "@lerna/describe-ref" "3.10.0"
-    "@lerna/validation-error" "3.6.0"
+    "@lerna/collect-uncommitted" "3.16.5"
+    "@lerna/describe-ref" "3.16.5"
+    "@lerna/validation-error" "3.13.0"
 
-"@lerna/child-process@3.3.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f"
+"@lerna/child-process@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.16.5.tgz#38fa3c18064aa4ac0754ad80114776a7b36a69b2"
+  integrity sha512-vdcI7mzei9ERRV4oO8Y1LHBZ3A5+ampRKg1wq5nutLsUA4mEBN6H7JqjWOMY9xZemv6+kATm2ofjJ3lW5TszQg==
   dependencies:
     chalk "^2.3.1"
     execa "^1.0.0"
     strong-log-transformer "^2.0.0"
 
-"@lerna/clean@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.10.6.tgz#31e4a12a722e57ca7adc0c9bc30ba70d55572bb8"
-  dependencies:
-    "@lerna/command" "3.10.6"
-    "@lerna/filter-options" "3.10.6"
-    "@lerna/prompt" "3.6.0"
-    "@lerna/pulse-till-done" "3.7.1"
-    "@lerna/rimraf-dir" "3.10.0"
-    p-map "^1.2.0"
+"@lerna/clean@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/clean/-/clean-3.20.0.tgz#ba777e373ddeae63e57860df75d47a9e5264c5b2"
+  integrity sha512-9ZdYrrjQvR5wNXmHfDsfjWjp0foOkCwKe3hrckTzkAeQA1ibyz5llGwz5e1AeFrV12e2/OLajVqYfe+qdkZUgg==
+  dependencies:
+    "@lerna/command" "3.18.5"
+    "@lerna/filter-options" "3.20.0"
+    "@lerna/prompt" "3.18.5"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/rimraf-dir" "3.16.5"
+    p-map "^2.1.0"
     p-map-series "^1.0.0"
     p-waterfall "^1.0.0"
 
-"@lerna/cli@3.10.7":
-  version "3.10.7"
-  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.10.7.tgz#2f88ae4a3c53fa4d3a4f61b5f447bbbcc69546e2"
+"@lerna/cli@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.5.tgz#c90c461542fcd35b6d5b015a290fb0dbfb41d242"
+  integrity sha512-erkbxkj9jfc89vVs/jBLY/fM0I80oLmJkFUV3Q3wk9J3miYhP14zgVEBsPZY68IZlEjT6T3Xlq2xO1AVaatHsA==
   dependencies:
-    "@lerna/global-options" "3.10.6"
+    "@lerna/global-options" "3.13.0"
     dedent "^0.7.0"
-    libnpm "^2.0.1"
-    yargs "^12.0.1"
+    npmlog "^4.1.2"
+    yargs "^14.2.2"
 
-"@lerna/collect-updates@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.10.1.tgz#3ad60aa31826c0c0cfdf8bf41e58e6c5c86aeb3a"
+"@lerna/collect-uncommitted@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-3.16.5.tgz#a494d61aac31cdc7aec4bbe52c96550274132e63"
+  integrity sha512-ZgqnGwpDZiWyzIQVZtQaj9tRizsL4dUOhuOStWgTAw1EMe47cvAY2kL709DzxFhjr6JpJSjXV5rZEAeU3VE0Hg==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/describe-ref" "3.10.0"
-    libnpm "^2.0.1"
-    minimatch "^3.0.4"
-    slash "^1.0.0"
+    "@lerna/child-process" "3.16.5"
+    chalk "^2.3.1"
+    figgy-pudding "^3.5.1"
+    npmlog "^4.1.2"
 
-"@lerna/command@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.10.6.tgz#709bd1c66220da67f65dbe1fc88bb7ba5bb85446"
+"@lerna/collect-updates@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.20.0.tgz#62f9d76ba21a25b7d9fbf31c02de88744a564bd1"
+  integrity sha512-qBTVT5g4fupVhBFuY4nI/3FSJtQVcDh7/gEPOpRxoXB/yCSnT38MFHXWl+y4einLciCjt/+0x6/4AG80fjay2Q==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/package-graph" "3.10.6"
-    "@lerna/project" "3.10.0"
-    "@lerna/validation-error" "3.6.0"
-    "@lerna/write-log-file" "3.6.0"
+    "@lerna/child-process" "3.16.5"
+    "@lerna/describe-ref" "3.16.5"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    slash "^2.0.0"
+
+"@lerna/command@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/command/-/command-3.18.5.tgz#14c6d2454adbfd365f8027201523e6c289cd3cd9"
+  integrity sha512-36EnqR59yaTU4HrR1C9XDFti2jRx0BgpIUBeWn129LZZB8kAB3ov1/dJNa1KcNRKp91DncoKHLY99FZ6zTNpMQ==
+  dependencies:
+    "@lerna/child-process" "3.16.5"
+    "@lerna/package-graph" "3.18.5"
+    "@lerna/project" "3.18.0"
+    "@lerna/validation-error" "3.13.0"
+    "@lerna/write-log-file" "3.13.0"
+    clone-deep "^4.0.1"
     dedent "^0.7.0"
     execa "^1.0.0"
-    is-ci "^1.0.10"
-    libnpm "^2.0.1"
-    lodash "^4.17.5"
-
-"@lerna/conventional-commits@3.10.8":
-  version "3.10.8"
-  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.10.8.tgz#b9f6dd8a09bc679f6afbb8296456de59e268fe3e"
-  dependencies:
-    "@lerna/validation-error" "3.6.0"
-    conventional-changelog-angular "^5.0.2"
-    conventional-changelog-core "^3.1.5"
-    conventional-recommended-bump "^4.0.4"
-    fs-extra "^7.0.0"
+    is-ci "^2.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/conventional-commits@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.18.5.tgz#08efd2e5b45acfaf3f151a53a3ec7ecade58a7bc"
+  integrity sha512-qcvXIEJ3qSgalxXnQ7Yxp5H9Ta5TVyai6vEor6AAEHc20WiO7UIdbLDCxBtiiHMdGdpH85dTYlsoYUwsCJu3HQ==
+  dependencies:
+    "@lerna/validation-error" "3.13.0"
+    conventional-changelog-angular "^5.0.3"
+    conventional-changelog-core "^3.1.6"
+    conventional-recommended-bump "^5.0.0"
+    fs-extra "^8.1.0"
     get-stream "^4.0.0"
-    libnpm "^2.0.1"
-    pify "^3.0.0"
-    semver "^5.5.0"
+    lodash.template "^4.5.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    pify "^4.0.1"
+    semver "^6.2.0"
 
-"@lerna/create-symlink@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.6.0.tgz#f1815cde2fc9d8d2315dfea44ee880f2f1bc65f1"
+"@lerna/create-symlink@3.16.2":
+  version "3.16.2"
+  resolved "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.2.tgz#412cb8e59a72f5a7d9463e4e4721ad2070149967"
+  integrity sha512-pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw==
   dependencies:
-    cmd-shim "^2.0.2"
-    fs-extra "^7.0.0"
-    libnpm "^2.0.1"
+    "@zkochan/cmd-shim" "^3.1.0"
+    fs-extra "^8.1.0"
+    npmlog "^4.1.2"
 
-"@lerna/create@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.10.6.tgz#85c7398cad912516c0ac6054a5c0c4145ab6cadb"
+"@lerna/create@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/create/-/create-3.18.5.tgz#11ac539f069248eaf7bc4c42e237784330f4fc47"
+  integrity sha512-cHpjocbpKmLopCuZFI7cKEM3E/QY8y+yC7VtZ4FQRSaLU8D8i2xXtXmYaP1GOlVNavji0iwoXjuNpnRMInIr2g==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.10.6"
-    "@lerna/npm-conf" "3.7.0"
-    "@lerna/validation-error" "3.6.0"
-    camelcase "^4.1.0"
+    "@evocateur/pacote" "^9.6.3"
+    "@lerna/child-process" "3.16.5"
+    "@lerna/command" "3.18.5"
+    "@lerna/npm-conf" "3.16.0"
+    "@lerna/validation-error" "3.13.0"
+    camelcase "^5.0.0"
     dedent "^0.7.0"
-    fs-extra "^7.0.0"
-    globby "^8.0.1"
+    fs-extra "^8.1.0"
+    globby "^9.2.0"
     init-package-json "^1.10.3"
-    libnpm "^2.0.1"
+    npm-package-arg "^6.1.0"
     p-reduce "^1.0.0"
-    pify "^3.0.0"
-    semver "^5.5.0"
-    slash "^1.0.0"
+    pify "^4.0.1"
+    semver "^6.2.0"
+    slash "^2.0.0"
     validate-npm-package-license "^3.0.3"
     validate-npm-package-name "^3.0.0"
     whatwg-url "^7.0.0"
 
-"@lerna/describe-ref@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.10.0.tgz#266380feece6013ab9674f52bd35bf0be5b0460d"
-  dependencies:
-    "@lerna/child-process" "3.3.0"
-    libnpm "^2.0.1"
-
-"@lerna/diff@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.10.6.tgz#b4c5a50d8c7e79619376e2c913ec1c627dfd0cdf"
+"@lerna/describe-ref@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.16.5.tgz#a338c25aaed837d3dc70b8a72c447c5c66346ac0"
+  integrity sha512-c01+4gUF0saOOtDBzbLMFOTJDHTKbDFNErEY6q6i9QaXuzy9LNN62z+Hw4acAAZuJQhrVWncVathcmkkjvSVGw==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.10.6"
-    "@lerna/validation-error" "3.6.0"
-    libnpm "^2.0.1"
+    "@lerna/child-process" "3.16.5"
+    npmlog "^4.1.2"
 
-"@lerna/exec@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.10.6.tgz#5564b614b7e39c1f034f5e0736c9e020945f2f12"
+"@lerna/diff@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.5.tgz#e9e2cb882f84d5b84f0487c612137305f07accbc"
+  integrity sha512-u90lGs+B8DRA9Z/2xX4YaS3h9X6GbypmGV6ITzx9+1Ga12UWGTVlKaCXBgONMBjzJDzAQOK8qPTwLA57SeBLgA==
   dependencies:
-    "@lerna/batch-packages" "3.10.6"
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.10.6"
-    "@lerna/filter-options" "3.10.6"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/validation-error" "3.6.0"
+    "@lerna/child-process" "3.16.5"
+    "@lerna/command" "3.18.5"
+    "@lerna/validation-error" "3.13.0"
+    npmlog "^4.1.2"
 
-"@lerna/filter-options@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.10.6.tgz#e05a8b8de6efc16c47c83f0ac58291008efba4b8"
-  dependencies:
-    "@lerna/collect-updates" "3.10.1"
-    "@lerna/filter-packages" "3.10.0"
+"@lerna/exec@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/exec/-/exec-3.20.0.tgz#29f0c01aee2340eb46f90706731fef2062a49639"
+  integrity sha512-pS1mmC7kzV668rHLWuv31ClngqeXjeHC8kJuM+W2D6IpUVMGQHLcCTYLudFgQsuKGVpl0DGNYG+sjLhAPiiu6A==
+  dependencies:
+    "@lerna/child-process" "3.16.5"
+    "@lerna/command" "3.18.5"
+    "@lerna/filter-options" "3.20.0"
+    "@lerna/profiler" "3.20.0"
+    "@lerna/run-topologically" "3.18.5"
+    "@lerna/validation-error" "3.13.0"
+    p-map "^2.1.0"
+
+"@lerna/filter-options@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.20.0.tgz#0f0f5d5a4783856eece4204708cc902cbc8af59b"
+  integrity sha512-bmcHtvxn7SIl/R9gpiNMVG7yjx7WyT0HSGw34YVZ9B+3xF/83N3r5Rgtjh4hheLZ+Q91Or0Jyu5O3Nr+AwZe2g==
+  dependencies:
+    "@lerna/collect-updates" "3.20.0"
+    "@lerna/filter-packages" "3.18.0"
     dedent "^0.7.0"
+    figgy-pudding "^3.5.1"
+    npmlog "^4.1.2"
 
-"@lerna/filter-packages@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.10.0.tgz#75f9a08184fc4046da2057e0218253cd6f493f05"
+"@lerna/filter-packages@3.18.0":
+  version "3.18.0"
+  resolved "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.18.0.tgz#6a7a376d285208db03a82958cfb8172e179b4e70"
+  integrity sha512-6/0pMM04bCHNATIOkouuYmPg6KH3VkPCIgTfQmdkPJTullERyEQfNUKikrefjxo1vHOoCACDpy65JYyKiAbdwQ==
   dependencies:
-    "@lerna/validation-error" "3.6.0"
-    libnpm "^2.0.1"
-    multimatch "^2.1.0"
+    "@lerna/validation-error" "3.13.0"
+    multimatch "^3.0.0"
+    npmlog "^4.1.2"
 
-"@lerna/get-npm-exec-opts@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.6.0.tgz#ea595eb28d1f34ba61a92ee8391f374282b4b76e"
+"@lerna/get-npm-exec-opts@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz#d1b552cb0088199fc3e7e126f914e39a08df9ea5"
+  integrity sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw==
   dependencies:
-    libnpm "^2.0.1"
+    npmlog "^4.1.2"
 
-"@lerna/get-packed@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.7.0.tgz#549c7738f7be5e3b1433e82ed9cda9123bcd1ed5"
+"@lerna/get-packed@3.16.0":
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.16.0.tgz#1b316b706dcee86c7baa55e50b087959447852ff"
+  integrity sha512-AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw==
   dependencies:
-    fs-extra "^7.0.0"
+    fs-extra "^8.1.0"
     ssri "^6.0.1"
     tar "^4.4.8"
 
-"@lerna/global-options@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.10.6.tgz#c491a64b0be47eca4ffc875011958a5ee70a9a3e"
-
-"@lerna/has-npm-version@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.10.0.tgz#d3a73c0fedd2f2e9c6fbe166c41809131dc939d2"
+"@lerna/github-client@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.16.5.tgz#2eb0235c3bf7a7e5d92d73e09b3761ab21f35c2e"
+  integrity sha512-rHQdn8Dv/CJrO3VouOP66zAcJzrHsm+wFuZ4uGAai2At2NkgKH+tpNhQy2H1PSC0Ezj9LxvdaHYrUzULqVK5Hw==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    semver "^5.5.0"
+    "@lerna/child-process" "3.16.5"
+    "@octokit/plugin-enterprise-rest" "^3.6.1"
+    "@octokit/rest" "^16.28.4"
+    git-url-parse "^11.1.2"
+    npmlog "^4.1.2"
 
-"@lerna/import@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.10.6.tgz#36b65854857e8ab5dfd98a1caea4d365ecc06578"
+"@lerna/gitlab-client@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz#91f4ec8c697b5ac57f7f25bd50fe659d24aa96a6"
+  integrity sha512-OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.10.6"
-    "@lerna/prompt" "3.6.0"
-    "@lerna/pulse-till-done" "3.7.1"
-    "@lerna/validation-error" "3.6.0"
+    node-fetch "^2.5.0"
+    npmlog "^4.1.2"
+    whatwg-url "^7.0.0"
+
+"@lerna/global-options@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1"
+  integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==
+
+"@lerna/has-npm-version@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.16.5.tgz#ab83956f211d8923ea6afe9b979b38cc73b15326"
+  integrity sha512-WL7LycR9bkftyqbYop5rEGJ9sRFIV55tSGmbN1HLrF9idwOCD7CLrT64t235t3t4O5gehDnwKI5h2U3oxTrF8Q==
+  dependencies:
+    "@lerna/child-process" "3.16.5"
+    semver "^6.2.0"
+
+"@lerna/import@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/import/-/import-3.18.5.tgz#a9c7d8601870729851293c10abd18b3707f7ba5e"
+  integrity sha512-PH0WVLEgp+ORyNKbGGwUcrueW89K3Iuk/DDCz8mFyG2IG09l/jOF0vzckEyGyz6PO5CMcz4TI1al/qnp3FrahQ==
+  dependencies:
+    "@lerna/child-process" "3.16.5"
+    "@lerna/command" "3.18.5"
+    "@lerna/prompt" "3.18.5"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
     dedent "^0.7.0"
-    fs-extra "^7.0.0"
+    fs-extra "^8.1.0"
     p-map-series "^1.0.0"
 
-"@lerna/init@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.10.6.tgz#b5c5166b2ddf00ea0f2742a1f53f59221478cf9a"
-  dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/command" "3.10.6"
-    fs-extra "^7.0.0"
-    p-map "^1.2.0"
-    write-json-file "^2.3.0"
-
-"@lerna/link@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.10.6.tgz#4201cabbfc27bebaf1a400f8cfbd238f285dd3c7"
-  dependencies:
-    "@lerna/command" "3.10.6"
-    "@lerna/package-graph" "3.10.6"
-    "@lerna/symlink-dependencies" "3.10.0"
-    p-map "^1.2.0"
-    slash "^1.0.0"
+"@lerna/info@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/info/-/info-3.20.0.tgz#3a5212f3029f2bc6255f9533bdf4bcb120ef329a"
+  integrity sha512-Rsz+KQF9mczbGUbPTrtOed1N0C+cA08Qz0eX/oI+NNjvsryZIju/o7uedG4I3P55MBiAioNrJI88fHH3eTgYug==
+  dependencies:
+    "@lerna/command" "3.18.5"
+    "@lerna/output" "3.13.0"
+    envinfo "^7.3.1"
+
+"@lerna/init@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/init/-/init-3.18.5.tgz#86dd0b2b3290755a96975069b5cb007f775df9f5"
+  integrity sha512-oCwipWrha98EcJAHm8AGd2YFFLNI7AW9AWi0/LbClj1+XY9ah+uifXIgYGfTk63LbgophDd8936ZEpHMxBsbAg==
+  dependencies:
+    "@lerna/child-process" "3.16.5"
+    "@lerna/command" "3.18.5"
+    fs-extra "^8.1.0"
+    p-map "^2.1.0"
+    write-json-file "^3.2.0"
+
+"@lerna/link@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/link/-/link-3.18.5.tgz#f24347e4f0b71d54575bd37cfa1794bc8ee91b18"
+  integrity sha512-xTN3vktJpkT7Nqc3QkZRtHO4bT5NvuLMtKNIBDkks0HpGxC9PRyyqwOoCoh1yOGbrWIuDezhfMg3Qow+6I69IQ==
+  dependencies:
+    "@lerna/command" "3.18.5"
+    "@lerna/package-graph" "3.18.5"
+    "@lerna/symlink-dependencies" "3.17.0"
+    p-map "^2.1.0"
+    slash "^2.0.0"
 
-"@lerna/list@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.10.6.tgz#7c43c09301ea01528f4dab3b22666f021e8ba9a5"
+"@lerna/list@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/list/-/list-3.20.0.tgz#7e67cc29c5cf661cfd097e8a7c2d3dcce7a81029"
+  integrity sha512-fXTicPrfioVnRzknyPawmYIVkzDRBaQqk9spejS1S3O1DOidkihK0xxNkr8HCVC0L22w6f92g83qWDp2BYRUbg==
   dependencies:
-    "@lerna/command" "3.10.6"
-    "@lerna/filter-options" "3.10.6"
-    "@lerna/listable" "3.10.6"
-    "@lerna/output" "3.6.0"
+    "@lerna/command" "3.18.5"
+    "@lerna/filter-options" "3.20.0"
+    "@lerna/listable" "3.18.5"
+    "@lerna/output" "3.13.0"
 
-"@lerna/listable@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.10.6.tgz#cea92de89d9f293c6d63e00be662bed03f85c496"
+"@lerna/listable@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.5.tgz#e82798405b5ed8fc51843c8ef1e7a0e497388a1a"
+  integrity sha512-Sdr3pVyaEv5A7ZkGGYR7zN+tTl2iDcinryBPvtuv20VJrXBE8wYcOks1edBTcOWsPjCE/rMP4bo1pseyk3UTsg==
   dependencies:
-    "@lerna/batch-packages" "3.10.6"
+    "@lerna/query-graph" "3.18.5"
     chalk "^2.3.1"
     columnify "^1.5.4"
 
-"@lerna/log-packed@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.6.0.tgz#bed96c2bdd47f076d9957d0c6069b2edc1518145"
+"@lerna/log-packed@3.16.0":
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.16.0.tgz#f83991041ee77b2495634e14470b42259fd2bc16"
+  integrity sha512-Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ==
   dependencies:
-    byte-size "^4.0.3"
+    byte-size "^5.0.1"
     columnify "^1.5.4"
     has-unicode "^2.0.1"
-    libnpm "^2.0.1"
+    npmlog "^4.1.2"
 
-"@lerna/npm-conf@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.7.0.tgz#f101d4fdf07cefcf1161bcfaf3c0f105b420a450"
+"@lerna/npm-conf@3.16.0":
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.16.0.tgz#1c10a89ae2f6c2ee96962557738685300d376827"
+  integrity sha512-HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA==
   dependencies:
     config-chain "^1.1.11"
-    pify "^3.0.0"
+    pify "^4.0.1"
 
-"@lerna/npm-dist-tag@3.8.5":
-  version "3.8.5"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.8.5.tgz#5ce22a72576badc8cb6baf85550043d63e66ea44"
+"@lerna/npm-dist-tag@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.5.tgz#9ef9abb7c104077b31f6fab22cc73b314d54ac55"
+  integrity sha512-xw0HDoIG6HreVsJND9/dGls1c+lf6vhu7yJoo56Sz5bvncTloYGLUppIfDHQr4ZvmPCK8rsh0euCVh2giPxzKQ==
   dependencies:
+    "@evocateur/npm-registry-fetch" "^4.0.0"
+    "@lerna/otplease" "3.18.5"
     figgy-pudding "^3.5.1"
-    libnpm "^2.0.1"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
 
-"@lerna/npm-install@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.10.0.tgz#fcd6688a3a2cd0e702a03c54c22eb7ae8b3dacb0"
+"@lerna/npm-install@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.16.5.tgz#d6bfdc16f81285da66515ae47924d6e278d637d3"
+  integrity sha512-hfiKk8Eku6rB9uApqsalHHTHY+mOrrHeWEs+gtg7+meQZMTS3kzv4oVp5cBZigndQr3knTLjwthT/FX4KvseFg==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/get-npm-exec-opts" "3.6.0"
-    fs-extra "^7.0.0"
-    libnpm "^2.0.1"
+    "@lerna/child-process" "3.16.5"
+    "@lerna/get-npm-exec-opts" "3.13.0"
+    fs-extra "^8.1.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
     signal-exit "^3.0.2"
     write-pkg "^3.1.0"
 
-"@lerna/npm-publish@3.10.7":
-  version "3.10.7"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.10.7.tgz#9326b747b905a7f0e69d4be3f557859c3e359649"
+"@lerna/npm-publish@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.18.5.tgz#240e4039959fd9816b49c5b07421e11b5cb000af"
+  integrity sha512-3etLT9+2L8JAx5F8uf7qp6iAtOLSMj+ZYWY6oUgozPi/uLqU0/gsMsEXh3F0+YVW33q0M61RpduBoAlOOZnaTg==
   dependencies:
-    "@lerna/run-lifecycle" "3.10.5"
+    "@evocateur/libnpmpublish" "^1.2.2"
+    "@lerna/otplease" "3.18.5"
+    "@lerna/run-lifecycle" "3.16.2"
     figgy-pudding "^3.5.1"
-    fs-extra "^7.0.0"
-    libnpm "^2.0.1"
+    fs-extra "^8.1.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    pify "^4.0.1"
+    read-package-json "^2.0.13"
 
-"@lerna/npm-run-script@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.10.0.tgz#49a9204eddea136da15a8d8d9eba2c3175b77ddd"
+"@lerna/npm-run-script@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.16.5.tgz#9c2ec82453a26c0b46edc0bb7c15816c821f5c15"
+  integrity sha512-1asRi+LjmVn3pMjEdpqKJZFT/3ZNpb+VVeJMwrJaV/3DivdNg7XlPK9LTrORuKU4PSvhdEZvJmSlxCKyDpiXsQ==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    "@lerna/get-npm-exec-opts" "3.6.0"
-    libnpm "^2.0.1"
+    "@lerna/child-process" "3.16.5"
+    "@lerna/get-npm-exec-opts" "3.13.0"
+    npmlog "^4.1.2"
 
-"@lerna/output@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.6.0.tgz#a69384bc685cf3b21aa1bfc697eb2b9db3333d0b"
+"@lerna/otplease@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.18.5.tgz#b77b8e760b40abad9f7658d988f3ea77d4fd0231"
+  integrity sha512-S+SldXAbcXTEDhzdxYLU0ZBKuYyURP/ND2/dK6IpKgLxQYh/z4ScljPDMyKymmEvgiEJmBsPZAAPfmNPEzxjog==
   dependencies:
-    libnpm "^2.0.1"
+    "@lerna/prompt" "3.18.5"
+    figgy-pudding "^3.5.1"
 
-"@lerna/pack-directory@3.10.5":
-  version "3.10.5"
-  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.10.5.tgz#9bdabceacb74e1f54e47bae925e193978f2aae51"
+"@lerna/output@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.npmjs.org/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989"
+  integrity sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg==
   dependencies:
-    "@lerna/get-packed" "3.7.0"
-    "@lerna/package" "3.7.2"
-    "@lerna/run-lifecycle" "3.10.5"
+    npmlog "^4.1.2"
+
+"@lerna/pack-directory@3.16.4":
+  version "3.16.4"
+  resolved "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.4.tgz#3eae5f91bdf5acfe0384510ed53faddc4c074693"
+  integrity sha512-uxSF0HZeGyKaaVHz5FroDY9A5NDDiCibrbYR6+khmrhZtY0Bgn6hWq8Gswl9iIlymA+VzCbshWIMX4o2O8C8ng==
+  dependencies:
+    "@lerna/get-packed" "3.16.0"
+    "@lerna/package" "3.16.0"
+    "@lerna/run-lifecycle" "3.16.2"
     figgy-pudding "^3.5.1"
-    libnpm "^2.0.1"
-    npm-packlist "^1.1.12"
-    tar "^4.4.8"
+    npm-packlist "^1.4.4"
+    npmlog "^4.1.2"
+    tar "^4.4.10"
     temp-write "^3.4.0"
 
-"@lerna/package-graph@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.10.6.tgz#8940d1ed7003100117cb1b618f7690585c00db81"
+"@lerna/package-graph@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.5.tgz#c740e2ea3578d059e551633e950690831b941f6b"
+  integrity sha512-8QDrR9T+dBegjeLr+n9WZTVxUYUhIUjUgZ0gvNxUBN8S1WB9r6H5Yk56/MVaB64tA3oGAN9IIxX6w0WvTfFudA==
   dependencies:
-    "@lerna/validation-error" "3.6.0"
-    libnpm "^2.0.1"
-    semver "^5.5.0"
+    "@lerna/prerelease-id-from-version" "3.16.0"
+    "@lerna/validation-error" "3.13.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    semver "^6.2.0"
 
-"@lerna/package@3.7.2":
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.7.2.tgz#03c69fd7fb965c372c8c969165a2f7d6dfe2dfcb"
+"@lerna/package@3.16.0":
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/@lerna/package/-/package-3.16.0.tgz#7e0a46e4697ed8b8a9c14d59c7f890e0d38ba13c"
+  integrity sha512-2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw==
   dependencies:
-    libnpm "^2.0.1"
-    load-json-file "^4.0.0"
+    load-json-file "^5.3.0"
+    npm-package-arg "^6.1.0"
     write-pkg "^3.1.0"
 
-"@lerna/project@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.10.0.tgz#98272bf2eb93e9b21850edae568d696bf7fdebda"
+"@lerna/prerelease-id-from-version@3.16.0":
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz#b24bfa789f5e1baab914d7b08baae9b7bd7d83a1"
+  integrity sha512-qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA==
+  dependencies:
+    semver "^6.2.0"
+
+"@lerna/profiler@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/profiler/-/profiler-3.20.0.tgz#0f6dc236f4ea8f9ea5f358c6703305a4f32ad051"
+  integrity sha512-bh8hKxAlm6yu8WEOvbLENm42i2v9SsR4WbrCWSbsmOElx3foRnMlYk7NkGECa+U5c3K4C6GeBbwgqs54PP7Ljg==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    fs-extra "^8.1.0"
+    npmlog "^4.1.2"
+    upath "^1.2.0"
+
+"@lerna/project@3.18.0":
+  version "3.18.0"
+  resolved "https://registry.npmjs.org/@lerna/project/-/project-3.18.0.tgz#56feee01daeb42c03cbdf0ed8a2a10cbce32f670"
+  integrity sha512-+LDwvdAp0BurOAWmeHE3uuticsq9hNxBI0+FMHiIai8jrygpJGahaQrBYWpwbshbQyVLeQgx3+YJdW2TbEdFWA==
   dependencies:
-    "@lerna/package" "3.7.2"
-    "@lerna/validation-error" "3.6.0"
-    cosmiconfig "^5.0.2"
+    "@lerna/package" "3.16.0"
+    "@lerna/validation-error" "3.13.0"
+    cosmiconfig "^5.1.0"
     dedent "^0.7.0"
     dot-prop "^4.2.0"
-    glob-parent "^3.1.0"
-    globby "^8.0.1"
-    libnpm "^2.0.1"
-    load-json-file "^4.0.0"
-    p-map "^1.2.0"
+    glob-parent "^5.0.0"
+    globby "^9.2.0"
+    load-json-file "^5.3.0"
+    npmlog "^4.1.2"
+    p-map "^2.1.0"
     resolve-from "^4.0.0"
-    write-json-file "^2.3.0"
+    write-json-file "^3.2.0"
 
-"@lerna/prompt@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.6.0.tgz#b17cc464dec9d830619723e879dc747367378217"
+"@lerna/prompt@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.18.5.tgz#628cd545f225887d060491ab95df899cfc5218a1"
+  integrity sha512-rkKj4nm1twSbBEb69+Em/2jAERK8htUuV8/xSjN0NPC+6UjzAwY52/x9n5cfmpa9lyKf/uItp7chCI7eDmNTKQ==
   dependencies:
     inquirer "^6.2.0"
-    libnpm "^2.0.1"
-
-"@lerna/publish@3.10.8":
-  version "3.10.8"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.10.8.tgz#fcf73ab2468807f5a8f3339234c2f66f0f65b088"
-  dependencies:
-    "@lerna/batch-packages" "3.10.6"
-    "@lerna/check-working-tree" "3.10.0"
-    "@lerna/child-process" "3.3.0"
-    "@lerna/collect-updates" "3.10.1"
-    "@lerna/command" "3.10.6"
-    "@lerna/describe-ref" "3.10.0"
-    "@lerna/log-packed" "3.6.0"
-    "@lerna/npm-conf" "3.7.0"
-    "@lerna/npm-dist-tag" "3.8.5"
-    "@lerna/npm-publish" "3.10.7"
-    "@lerna/output" "3.6.0"
-    "@lerna/pack-directory" "3.10.5"
-    "@lerna/prompt" "3.6.0"
-    "@lerna/pulse-till-done" "3.7.1"
-    "@lerna/run-lifecycle" "3.10.5"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/validation-error" "3.6.0"
-    "@lerna/version" "3.10.8"
+    npmlog "^4.1.2"
+
+"@lerna/publish@3.20.2":
+  version "3.20.2"
+  resolved "https://registry.npmjs.org/@lerna/publish/-/publish-3.20.2.tgz#a45d29813099b3249657ea913d0dc3f8ebc5cc2e"
+  integrity sha512-N7Y6PdhJ+tYQPdI1tZum8W25cDlTp4D6brvRacKZusweWexxaopbV8RprBaKexkEX/KIbncuADq7qjDBdQHzaA==
+  dependencies:
+    "@evocateur/libnpmaccess" "^3.1.2"
+    "@evocateur/npm-registry-fetch" "^4.0.0"
+    "@evocateur/pacote" "^9.6.3"
+    "@lerna/check-working-tree" "3.16.5"
+    "@lerna/child-process" "3.16.5"
+    "@lerna/collect-updates" "3.20.0"
+    "@lerna/command" "3.18.5"
+    "@lerna/describe-ref" "3.16.5"
+    "@lerna/log-packed" "3.16.0"
+    "@lerna/npm-conf" "3.16.0"
+    "@lerna/npm-dist-tag" "3.18.5"
+    "@lerna/npm-publish" "3.18.5"
+    "@lerna/otplease" "3.18.5"
+    "@lerna/output" "3.13.0"
+    "@lerna/pack-directory" "3.16.4"
+    "@lerna/prerelease-id-from-version" "3.16.0"
+    "@lerna/prompt" "3.18.5"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/run-lifecycle" "3.16.2"
+    "@lerna/run-topologically" "3.18.5"
+    "@lerna/validation-error" "3.13.0"
+    "@lerna/version" "3.20.2"
     figgy-pudding "^3.5.1"
-    fs-extra "^7.0.0"
-    libnpm "^2.0.1"
+    fs-extra "^8.1.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
     p-finally "^1.0.0"
-    p-map "^1.2.0"
+    p-map "^2.1.0"
     p-pipe "^1.2.0"
-    p-reduce "^1.0.0"
-    semver "^5.5.0"
+    semver "^6.2.0"
 
-"@lerna/pulse-till-done@3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.7.1.tgz#a9e55380fa18f6896a3e5b23621a4227adfb8f85"
+"@lerna/pulse-till-done@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz#c8e9ce5bafaf10d930a67d7ed0ccb5d958fe0110"
+  integrity sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA==
   dependencies:
-    libnpm "^2.0.1"
+    npmlog "^4.1.2"
 
-"@lerna/resolve-symlink@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.6.0.tgz#985344796b704ff32afa923901e795e80741b86e"
+"@lerna/query-graph@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.5.tgz#df4830bb5155273003bf35e8dda1c32d0927bd86"
+  integrity sha512-50Lf4uuMpMWvJ306be3oQDHrWV42nai9gbIVByPBYJuVW8dT8O8pA3EzitNYBUdLL9/qEVbrR0ry1HD7EXwtRA==
+  dependencies:
+    "@lerna/package-graph" "3.18.5"
+    figgy-pudding "^3.5.1"
+
+"@lerna/resolve-symlink@3.16.0":
+  version "3.16.0"
+  resolved "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz#37fc7095fabdbcf317c26eb74e0d0bde8efd2386"
+  integrity sha512-Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ==
   dependencies:
-    fs-extra "^7.0.0"
-    libnpm "^2.0.1"
+    fs-extra "^8.1.0"
+    npmlog "^4.1.2"
     read-cmd-shim "^1.0.1"
 
-"@lerna/rimraf-dir@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.10.0.tgz#2d9435054ab7bbc5519db0a2654c5d8cacd27f98"
+"@lerna/rimraf-dir@3.16.5":
+  version "3.16.5"
+  resolved "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.16.5.tgz#04316ab5ffd2909657aaf388ea502cb8c2f20a09"
+  integrity sha512-bQlKmO0pXUsXoF8lOLknhyQjOZsCc0bosQDoX4lujBXSWxHVTg1VxURtWf2lUjz/ACsJVDfvHZbDm8kyBk5okA==
   dependencies:
-    "@lerna/child-process" "3.3.0"
-    libnpm "^2.0.1"
+    "@lerna/child-process" "3.16.5"
+    npmlog "^4.1.2"
     path-exists "^3.0.0"
     rimraf "^2.6.2"
 
-"@lerna/run-lifecycle@3.10.5":
-  version "3.10.5"
-  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.10.5.tgz#ea4422bb70c0f8d4382ecb2a626c8ba0ca88550b"
+"@lerna/run-lifecycle@3.16.2":
+  version "3.16.2"
+  resolved "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz#67b288f8ea964db9ea4fb1fbc7715d5bbb0bce00"
+  integrity sha512-RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A==
   dependencies:
-    "@lerna/npm-conf" "3.7.0"
+    "@lerna/npm-conf" "3.16.0"
     figgy-pudding "^3.5.1"
-    libnpm "^2.0.1"
+    npm-lifecycle "^3.1.2"
+    npmlog "^4.1.2"
 
-"@lerna/run-parallel-batches@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840"
+"@lerna/run-topologically@3.18.5":
+  version "3.18.5"
+  resolved "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.5.tgz#3cd639da20e967d7672cb88db0f756b92f2fdfc3"
+  integrity sha512-6N1I+6wf4hLOnPW+XDZqwufyIQ6gqoPfHZFkfWlvTQ+Ue7CuF8qIVQ1Eddw5HKQMkxqN10thKOFfq/9NQZ4NUg==
   dependencies:
-    p-map "^1.2.0"
+    "@lerna/query-graph" "3.18.5"
+    figgy-pudding "^3.5.1"
+    p-queue "^4.0.0"
+
+"@lerna/run@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.npmjs.org/@lerna/run/-/run-3.20.0.tgz#a479f7c42bdf9ebabb3a1e5a2bdebb7a8d201151"
+  integrity sha512-9U3AqeaCeB7KsGS9oyKNp62s9vYoULg/B4cqXTKZkc+OKL6QOEjYHYVSBcMK9lUXrMjCjDIuDSX3PnTCPxQ2Dw==
+  dependencies:
+    "@lerna/command" "3.18.5"
+    "@lerna/filter-options" "3.20.0"
+    "@lerna/npm-run-script" "3.16.5"
+    "@lerna/output" "3.13.0"
+    "@lerna/profiler" "3.20.0"
+    "@lerna/run-topologically" "3.18.5"
+    "@lerna/timer" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+    p-map "^2.1.0"
+
+"@lerna/symlink-binary@3.17.0":
+  version "3.17.0"
+  resolved "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.17.0.tgz#8f8031b309863814883d3f009877f82e38aef45a"
+  integrity sha512-RLpy9UY6+3nT5J+5jkM5MZyMmjNHxZIZvXLV+Q3MXrf7Eaa1hNqyynyj4RO95fxbS+EZc4XVSk25DGFQbcRNSQ==
+  dependencies:
+    "@lerna/create-symlink" "3.16.2"
+    "@lerna/package" "3.16.0"
+    fs-extra "^8.1.0"
+    p-map "^2.1.0"
+
+"@lerna/symlink-dependencies@3.17.0":
+  version "3.17.0"
+  resolved "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.17.0.tgz#48d6360e985865a0e56cd8b51b308a526308784a"
+  integrity sha512-KmjU5YT1bpt6coOmdFueTJ7DFJL4H1w5eF8yAQ2zsGNTtZ+i5SGFBWpb9AQaw168dydc3s4eu0W0Sirda+F59Q==
+  dependencies:
+    "@lerna/create-symlink" "3.16.2"
+    "@lerna/resolve-symlink" "3.16.0"
+    "@lerna/symlink-binary" "3.17.0"
+    fs-extra "^8.1.0"
+    p-finally "^1.0.0"
+    p-map "^2.1.0"
     p-map-series "^1.0.0"
 
-"@lerna/run@3.10.6":
-  version "3.10.6"
-  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.10.6.tgz#4c159a719b0ec010409dfe8f9535c9a3c3f3e06a"
-  dependencies:
-    "@lerna/batch-packages" "3.10.6"
-    "@lerna/command" "3.10.6"
-    "@lerna/filter-options" "3.10.6"
-    "@lerna/npm-run-script" "3.10.0"
-    "@lerna/output" "3.6.0"
-    "@lerna/run-parallel-batches" "3.0.0"
-    "@lerna/timer" "3.5.0"
-    "@lerna/validation-error" "3.6.0"
-    p-map "^1.2.0"
-
-"@lerna/symlink-binary@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.10.0.tgz#5acdde86dfd50c9270d7d2a93bade203cff41b3d"
-  dependencies:
-    "@lerna/create-symlink" "3.6.0"
-    "@lerna/package" "3.7.2"
-    fs-extra "^7.0.0"
-    p-map "^1.2.0"
+"@lerna/timer@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.npmjs.org/@lerna/timer/-/timer-3.13.0.tgz#bcd0904551db16e08364d6c18e5e2160fc870781"
+  integrity sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw==
 
-"@lerna/symlink-dependencies@3.10.0":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.10.0.tgz#a20226e8e97af6a6bc4b416bfc28c0c5e3ba9ddd"
+"@lerna/validation-error@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.13.0.tgz#c86b8f07c5ab9539f775bd8a54976e926f3759c3"
+  integrity sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA==
   dependencies:
-    "@lerna/create-symlink" "3.6.0"
-    "@lerna/resolve-symlink" "3.6.0"
-    "@lerna/symlink-binary" "3.10.0"
-    fs-extra "^7.0.0"
-    p-finally "^1.0.0"
-    p-map "^1.2.0"
-    p-map-series "^1.0.0"
-
-"@lerna/timer@3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.5.0.tgz#8dee6acf002c55de64678c66ef37ca52143f1b9b"
+    npmlog "^4.1.2"
 
-"@lerna/validation-error@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.6.0.tgz#550cf66bb2ef88edc02e36017b575a7a9100d5d8"
-  dependencies:
-    libnpm "^2.0.1"
-
-"@lerna/version@3.10.8":
-  version "3.10.8"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.10.8.tgz#14a645724b0369f84a0bf4c1eb093e8e96a219f1"
-  dependencies:
-    "@lerna/batch-packages" "3.10.6"
-    "@lerna/check-working-tree" "3.10.0"
-    "@lerna/child-process" "3.3.0"
-    "@lerna/collect-updates" "3.10.1"
-    "@lerna/command" "3.10.6"
-    "@lerna/conventional-commits" "3.10.8"
-    "@lerna/output" "3.6.0"
-    "@lerna/prompt" "3.6.0"
-    "@lerna/run-lifecycle" "3.10.5"
-    "@lerna/validation-error" "3.6.0"
+"@lerna/version@3.20.2":
+  version "3.20.2"
+  resolved "https://registry.npmjs.org/@lerna/version/-/version-3.20.2.tgz#3709141c0f537741d9bc10cb24f56897bcb30428"
+  integrity sha512-ckBJMaBWc+xJen0cMyCE7W67QXLLrc0ELvigPIn8p609qkfNM0L0CF803MKxjVOldJAjw84b8ucNWZLvJagP/Q==
+  dependencies:
+    "@lerna/check-working-tree" "3.16.5"
+    "@lerna/child-process" "3.16.5"
+    "@lerna/collect-updates" "3.20.0"
+    "@lerna/command" "3.18.5"
+    "@lerna/conventional-commits" "3.18.5"
+    "@lerna/github-client" "3.16.5"
+    "@lerna/gitlab-client" "3.15.0"
+    "@lerna/output" "3.13.0"
+    "@lerna/prerelease-id-from-version" "3.16.0"
+    "@lerna/prompt" "3.18.5"
+    "@lerna/run-lifecycle" "3.16.2"
+    "@lerna/run-topologically" "3.18.5"
+    "@lerna/validation-error" "3.13.0"
     chalk "^2.3.1"
     dedent "^0.7.0"
-    libnpm "^2.0.1"
+    load-json-file "^5.3.0"
     minimatch "^3.0.4"
-    p-map "^1.2.0"
+    npmlog "^4.1.2"
+    p-map "^2.1.0"
     p-pipe "^1.2.0"
     p-reduce "^1.0.0"
     p-waterfall "^1.0.0"
-    semver "^5.5.0"
-    slash "^1.0.0"
+    semver "^6.2.0"
+    slash "^2.0.0"
     temp-write "^3.4.0"
+    write-json-file "^3.2.0"
 
-"@lerna/write-log-file@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.6.0.tgz#b8d5a7efc84fa93cbd67d724d11120343b2a849a"
+"@lerna/write-log-file@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.13.0.tgz#b78d9e4cfc1349a8be64d91324c4c8199e822a26"
+  integrity sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==
   dependencies:
-    libnpm "^2.0.1"
+    npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  resolved "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
   dependencies:
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
 "@nodelib/fs.stat@^1.1.2":
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@types/babel-types@*", "@types/babel-types@^7.0.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.1.tgz#1405e5396968c4302994b0161ce405b72b874257"
+"@octokit/auth-token@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz#b64178975218b99e4dfe948253f0673cbbb59d9f"
+  integrity sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==
+  dependencies:
+    "@octokit/types" "^2.0.0"
 
-"@types/babylon@^6.16.2":
-  version "6.16.2"
-  resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
+"@octokit/endpoint@^5.5.0":
+  version "5.5.3"
+  resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.3.tgz#0397d1baaca687a4c8454ba424a627699d97c978"
+  integrity sha512-EzKwkwcxeegYYah5ukEeAI/gYRLv2Y9U5PpIsseGSFDk+G3RbipQGBs8GuYS1TLCtQaqoO66+aQGtITPalxsNQ==
   dependencies:
-    "@types/babel-types" "*"
+    "@octokit/types" "^2.0.0"
+    is-plain-object "^3.0.0"
+    universal-user-agent "^5.0.0"
 
-JSONStream@^1.0.4:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+"@octokit/plugin-enterprise-rest@^3.6.1":
+  version "3.6.2"
+  resolved "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz#74de25bef21e0182b4fa03a8678cd00a4e67e561"
+  integrity sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==
+
+"@octokit/plugin-paginate-rest@^1.1.1":
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz#004170acf8c2be535aba26727867d692f7b488fc"
+  integrity sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==
   dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
+    "@octokit/types" "^2.0.1"
+
+"@octokit/plugin-request-log@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e"
+  integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==
+
+"@octokit/plugin-rest-endpoint-methods@2.4.0":
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz#3288ecf5481f68c494dd0602fc15407a59faf61e"
+  integrity sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==
+  dependencies:
+    "@octokit/types" "^2.0.1"
+    deprecation "^2.3.1"
+
+"@octokit/request-error@^1.0.1", "@octokit/request-error@^1.0.2":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz#ede0714c773f32347576c25649dc013ae6b31801"
+  integrity sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==
+  dependencies:
+    "@octokit/types" "^2.0.0"
+    deprecation "^2.0.0"
+    once "^1.4.0"
 
-JSONStream@^1.3.4:
+"@octokit/request@^5.2.0":
+  version "5.3.2"
+  resolved "https://registry.npmjs.org/@octokit/request/-/request-5.3.2.tgz#1ca8b90a407772a1ee1ab758e7e0aced213b9883"
+  integrity sha512-7NPJpg19wVQy1cs2xqXjjRq/RmtSomja/VSWnptfYwuBxLdbYh2UjhGi0Wx7B1v5Iw5GKhfFDQL7jM7SSp7K2g==
+  dependencies:
+    "@octokit/endpoint" "^5.5.0"
+    "@octokit/request-error" "^1.0.1"
+    "@octokit/types" "^2.0.0"
+    deprecation "^2.0.0"
+    is-plain-object "^3.0.0"
+    node-fetch "^2.3.0"
+    once "^1.4.0"
+    universal-user-agent "^5.0.0"
+
+"@octokit/rest@^16.28.4":
+  version "16.43.1"
+  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz#3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b"
+  integrity sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==
+  dependencies:
+    "@octokit/auth-token" "^2.4.0"
+    "@octokit/plugin-paginate-rest" "^1.1.1"
+    "@octokit/plugin-request-log" "^1.0.0"
+    "@octokit/plugin-rest-endpoint-methods" "2.4.0"
+    "@octokit/request" "^5.2.0"
+    "@octokit/request-error" "^1.0.2"
+    atob-lite "^2.0.0"
+    before-after-hook "^2.0.0"
+    btoa-lite "^1.0.0"
+    deprecation "^2.0.0"
+    lodash.get "^4.4.2"
+    lodash.set "^4.3.2"
+    lodash.uniq "^4.5.0"
+    octokit-pagination-methods "^1.1.0"
+    once "^1.4.0"
+    universal-user-agent "^4.0.0"
+
+"@octokit/types@^2.0.0", "@octokit/types@^2.0.1":
+  version "2.5.0"
+  resolved "https://registry.npmjs.org/@octokit/types/-/types-2.5.0.tgz#f1bbd147e662ae2c79717d518aac686e58257773"
+  integrity sha512-KEnLwOfdXzxPNL34fj508bhi9Z9cStyN7qY1kOfVahmqtAfrWw6Oq3P4R+dtsg0lYtZdWBpUrS/Ixmd5YILSww==
+  dependencies:
+    "@types/node" ">= 8"
+
+"@types/babel__core@^7.1.0":
+  version "7.1.6"
+  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610"
+  integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.1"
+  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
+  integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.0.2"
+  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.0.9"
+  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz#be82fab304b141c3eee81a4ce3b034d0eba1590a"
+  integrity sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
+  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
+  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+    "@types/istanbul-lib-report" "*"
+
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
+"@types/node@*", "@types/node@>= 8":
+  version "13.9.1"
+  resolved "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72"
+  integrity sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==
+
+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
+"@types/yargs-parser@*":
+  version "15.0.0"
+  resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+
+"@types/yargs@^13.0.0":
+  version "13.0.8"
+  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99"
+  integrity sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+"@zkochan/cmd-shim@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e"
+  integrity sha512-o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg==
+  dependencies:
+    is-windows "^1.0.0"
+    mkdirp-promise "^5.0.1"
+    mz "^2.5.0"
+
+JSONStream@^1.0.4, JSONStream@^1.3.4:
   version "1.3.5"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
 abab@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
 abbrev@1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-acorn-globals@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
-  dependencies:
-    acorn "^4.0.4"
+  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 acorn-globals@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
 acorn-walk@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
+  version "6.2.0"
+  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
-acorn@^3.0.4, acorn@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
-acorn@^4.0.4, acorn@~4.0.2:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+acorn-walk@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
+  integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
 
 acorn@^5.5.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  version "5.7.4"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^6.0.1:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.6.tgz#cd75181670d5b99bdb1b1c993941d3a239ab1f56"
+  version "6.4.1"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
+
+acorn@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+
+acorn@~4.0.2:
+  version "4.0.13"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
+
+agent-base@4, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
 
-agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+agent-base@~4.2.1:
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  resolved "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 agentkeepalive@^3.4.1:
   version "3.5.2"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
   dependencies:
     humanize-ms "^1.2.1"
 
 ajv@^4.9.1:
   version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
 ajv@^6.5.5:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
+  version "6.12.0"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
   dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  resolved "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
@@ -772,239 +1361,294 @@ align-text@^0.1.1, align-text@^0.1.3:
 
 amdefine@>=0.0.4:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
+ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
 anymatch@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  dependencies:
-    default-require-extensions "^2.0.0"
-
-aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-"aproba@^1.1.2 || 2", aproba@^2.0.0:
+aproba@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
 are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  version "1.1.5"
+  resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
+array-differ@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1"
+  integrity sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w==
 
 array-equal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  resolved "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
 array-find-index@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  resolved "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-ify@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+  resolved "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
-array-union@^1.0.1:
+array-union@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  resolved "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  resolved "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-arrify@^1.0.0, arrify@^1.0.1:
+arrify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asap@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
+  resolved "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
+  integrity sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0=
 
 asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+  version "0.2.4"
+  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
 
 assign-symbols@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 astral-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-
-async@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-async@^2.5.0, async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  dependencies:
-    lodash "^4.17.10"
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async@~0.2.6:
   version "0.2.10"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  resolved "https://registry.npmjs.org/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob-lite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
+  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
 
-atob@^2.1.1:
+atob@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 aws-sign2@~0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+aws4@^1.2.1, aws4@^1.8.0:
+  version "1.9.1"
+  resolved "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
 
-babel-jest@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.0.0.tgz#8a0c767f03f4a595fb921afdab13ff126edd00da"
+babel-jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
+  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
   dependencies:
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/babel__core" "^7.1.0"
     babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.0.0"
+    babel-preset-jest "^24.9.0"
+    chalk "^2.4.2"
+    slash "^2.0.0"
 
 babel-plugin-istanbul@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.1.tgz#7981590f1956d75d67630ba46f0c22493588c893"
+  version "5.2.0"
+  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
+  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
   dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
     find-up "^3.0.0"
-    istanbul-lib-instrument "^3.0.0"
-    test-exclude "^5.0.0"
+    istanbul-lib-instrument "^3.3.0"
+    test-exclude "^5.2.3"
 
-babel-plugin-jest-hoist@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.0.0.tgz#3adf030b6fd67e4311479a54b24077bdfc226ec9"
+babel-plugin-jest-hoist@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
+  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
+  dependencies:
+    "@types/babel__traverse" "^7.0.6"
 
-babel-preset-jest@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.0.0.tgz#d23782e5e036cff517859640a80960bd628bd82b"
+babel-preset-jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
+  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
   dependencies:
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.0.0"
+    babel-plugin-jest-hoist "^24.9.0"
 
-babel-runtime@^6.26.0:
+babel-runtime@^6.11.6, babel-runtime@^6.26.0:
   version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babel-types@^6.26.0:
+babel-types@^6.15.0:
   version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@^6.18.0:
+babylon-walk@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/babylon-walk/-/babylon-walk-1.0.2.tgz#3b15a5ddbb482a78b4ce9c01c8ba181702d9d6ce"
+  integrity sha1-OxWl3btIKni0zpwByLoYFwLZ1s4=
+  dependencies:
+    babel-runtime "^6.11.6"
+    babel-types "^6.15.0"
+    lodash.clone "^4.5.0"
+
+babylon@^6.9.1:
   version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 balanced-match@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 barrage@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/barrage/-/barrage-1.1.0.tgz#6f5384765c463f7718012f160dccf033fc6fc394"
+  resolved "https://registry.npmjs.org/barrage/-/barrage-1.1.0.tgz#6f5384765c463f7718012f160dccf033fc6fc394"
+  integrity sha1-b1OEdlxGP3cYAS8WDczwM/xvw5Q=
   dependencies:
     promise "^6.0.0"
 
 base@^0.11.1:
   version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  resolved "https://registry.npmjs.org/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1015,47 +1659,55 @@ base@^0.11.1:
     pascalcase "^0.1.1"
 
 bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
-bin-links@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757"
+before-after-hook@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
+  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
   dependencies:
-    bluebird "^3.5.0"
-    cmd-shim "^2.0.2"
-    gentle-fs "^2.0.0"
-    graceful-fs "^4.1.11"
-    write-file-atomic "^2.3.0"
+    file-uri-to-path "1.0.0"
 
 block-stream@*:
   version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  resolved "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 boom@2.x.x:
   version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  resolved "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 braces@^2.3.1:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1068,64 +1720,75 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-browser-process-hrtime@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 browser-resolve@^1.11.3:
   version "1.11.3"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  resolved "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
   dependencies:
     resolve "1.1.7"
 
-bser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+btoa-lite@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
+  integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
 
-builtin-modules@^1.0.0:
+buffer-from@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 builtins@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 byline@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+  resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
+  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
 
-byte-size@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.4.tgz#29d381709f41aae0d89c631f1c81aec88cd40b23"
+byte-size@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/byte-size/-/byte-size-5.0.1.tgz#4b651039a5ecd96767e71a3d7ed380e48bed4191"
+  integrity sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw==
 
-cacache@^11.0.1, cacache@^11.3.2:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+cacache@^12.0.0, cacache@^12.0.3:
+  version "12.0.3"
+  resolved "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
+  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
   dependencies:
-    bluebird "^3.5.3"
+    bluebird "^3.5.5"
     chownr "^1.1.1"
     figgy-pudding "^3.5.1"
-    glob "^7.1.3"
+    glob "^7.1.4"
     graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
     lru-cache "^5.1.1"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
     move-concurrently "^1.0.1"
     promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
+    rimraf "^2.6.3"
     ssri "^6.0.1"
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
 cache-base@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -1139,38 +1802,45 @@ cache-base@^1.0.1:
 
 call-me-maybe@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
 
 caller-callsite@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  resolved "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
   dependencies:
     callsites "^2.0.0"
 
 caller-path@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  resolved "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
   dependencies:
     caller-callsite "^2.0.0"
 
 callsites@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 callsites@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
 camelcase-keys@^4.0.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -1178,316 +1848,349 @@ camelcase-keys@^4.0.0:
 
 camelcase@^1.0.2:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
 camelcase@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+camelcase@^5.0.0, camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-capture-exit@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
   dependencies:
-    rsvp "^3.3.3"
+    rsvp "^4.8.4"
 
 caseless@~0.12.0:
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 center-align@^0.1.1:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  resolved "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
   dependencies:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-character-parser@^2.1.1:
+character-parser@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  resolved "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
   dependencies:
     is-regex "^1.0.3"
 
 chardet@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chownr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-
-ci-info@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
+chownr@^1.1.1, chownr@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
 ci-info@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 class-utils@^0.3.5:
   version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@^4.1.11:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+clean-css@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
   dependencies:
     source-map "~0.6.0"
 
 cli-cursor@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
   dependencies:
     center-align "^0.1.1"
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
   dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
 
 clone@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 clone@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
-
-cmd-shim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
-  dependencies:
-    graceful-fs "^4.1.2"
-    mkdirp "~0.5.0"
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 coffee-script@~1.12.7:
   version "1.12.7"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+  resolved "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+  integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
 
 collection-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
 color-convert@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  version "1.9.3"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
-    color-name "^1.1.1"
+    color-name "1.1.3"
 
-color-name@^1.1.1:
+color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 columnify@^1.5.4:
   version "1.5.4"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  resolved "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
   dependencies:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 compare-func@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  resolved "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
   dependencies:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
 
-compare-versions@^3.2.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
-
 component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.4.6, concat-stream@^1.4.7:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
+concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
+    buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@^1.5.0, concat-stream@^1.6.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+concat-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
-    readable-stream "^2.2.2"
+    readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
 config-chain@^1.1.11:
   version "1.1.12"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
   dependencies:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
-constantinople@^3.0.1, constantinople@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.2.tgz#d45ed724f57d3d10500017a7d3a889c1381ae647"
+constantinople@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
+  integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==
   dependencies:
-    "@types/babel-types" "^7.0.0"
-    "@types/babylon" "^6.16.2"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
+    "@babel/parser" "^7.6.0"
+    "@babel/types" "^7.6.1"
 
-conventional-changelog-angular@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a"
+conventional-changelog-angular@^5.0.3:
+  version "5.0.6"
+  resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz#269540c624553aded809c29a3508fdc2b544c059"
+  integrity sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-core@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c"
+conventional-changelog-core@^3.1.6:
+  version "3.2.3"
+  resolved "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz#b31410856f431c847086a7dcb4d2ca184a7d88fb"
+  integrity sha512-LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ==
   dependencies:
-    conventional-changelog-writer "^4.0.2"
-    conventional-commits-parser "^3.0.1"
+    conventional-changelog-writer "^4.0.6"
+    conventional-commits-parser "^3.0.3"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
     git-raw-commits "2.0.0"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^2.0.2"
+    git-semver-tags "^2.0.3"
     lodash "^4.2.1"
     normalize-package-data "^2.3.5"
     q "^1.5.1"
     read-pkg "^3.0.0"
     read-pkg-up "^3.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
-conventional-changelog-preset-loader@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
+conventional-changelog-preset-loader@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz#580fa8ab02cef22c24294d25e52d7ccd247a9a6a"
+  integrity sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ==
 
-conventional-changelog-writer@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.2.tgz#eb493ed84269e7a663da36e49af51c54639c9a67"
+conventional-changelog-writer@^4.0.6:
+  version "4.0.11"
+  resolved "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz#9f56d2122d20c96eb48baae0bf1deffaed1edba4"
+  integrity sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.1"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
-    handlebars "^4.0.2"
+    handlebars "^4.4.0"
     json-stringify-safe "^5.0.1"
-    lodash "^4.2.1"
-    meow "^4.0.0"
-    semver "^5.5.0"
+    lodash "^4.17.15"
+    meow "^5.0.0"
+    semver "^6.0.0"
     split "^1.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
 
-conventional-commits-filter@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.1.tgz#55a135de1802f6510b6758e0a6aa9e0b28618db3"
+conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
   dependencies:
-    is-subset "^0.1.1"
+    lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
+conventional-commits-parser@^3.0.3:
+  version "3.0.8"
+  resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz#23310a9bda6c93c874224375e72b09fb275fe710"
+  integrity sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==
   dependencies:
     JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
-    lodash "^4.2.1"
-    meow "^4.0.0"
+    is-text-path "^1.0.1"
+    lodash "^4.17.15"
+    meow "^5.0.0"
     split2 "^2.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-recommended-bump@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
+conventional-recommended-bump@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz#5af63903947b6e089e77767601cb592cabb106ba"
+  integrity sha512-RVdt0elRcCxL90IrNP0fYCpq1uGt2MALko0eyeQ+zQuDVWtMGAy9ng6yYn3kax42lCj9+XBxQ8ZN6S9bdKxDhQ==
   dependencies:
-    concat-stream "^1.6.0"
-    conventional-changelog-preset-loader "^2.0.2"
-    conventional-commits-filter "^2.0.1"
-    conventional-commits-parser "^3.0.1"
+    concat-stream "^2.0.0"
+    conventional-changelog-preset-loader "^2.1.1"
+    conventional-commits-filter "^2.0.2"
+    conventional-commits-parser "^3.0.3"
     git-raw-commits "2.0.0"
-    git-semver-tags "^2.0.2"
+    git-semver-tags "^2.0.3"
     meow "^4.0.0"
     q "^1.5.1"
 
-convert-source-map@^1.1.0, convert-source-map@^1.4.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+convert-source-map@^1.4.0, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  resolved "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -1498,39 +2201,44 @@ copy-concurrently@^1.0.0:
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js@^2.4.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+  version "2.6.11"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@^5.0.2:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+cosmiconfig@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
+    js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-coveralls@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.2.tgz#f5a0bcd90ca4e64e088b710fa8dda640aea4884f"
+coveralls@3.0.9:
+  version "3.0.9"
+  resolved "https://registry.npmjs.org/coveralls/-/coveralls-3.0.9.tgz#8cfc5a5525f84884e2948a0bf0f1c0e90aac0420"
+  integrity sha512-nNBg3B1+4iDox5A5zqHKzUTiwl2ey4k2o0NEcVZYvl+GOSJdKBj4AJGKLv6h3SvWch7tABHePAQOSZWM9E2hMg==
   dependencies:
-    growl "~> 1.10.0"
-    js-yaml "^3.11.0"
-    lcov-parse "^0.0.10"
+    js-yaml "^3.13.1"
+    lcov-parse "^1.0.0"
     log-driver "^1.2.7"
     minimist "^1.2.0"
-    request "^2.85.0"
+    request "^2.88.0"
 
 cross-spawn@^6.0.0:
   version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -1540,49 +2248,58 @@ cross-spawn@^6.0.0:
 
 cryptiles@2.x.x:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  resolved "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
 css-parse@1.7.x:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  resolved "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+  version "0.3.8"
+  resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 cssstyle@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
   dependencies:
     cssom "0.3.x"
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  resolved "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
 dargs@^4.0.1:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  resolved "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
   dependencies:
     number-is-nan "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-urls@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  resolved "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
   dependencies:
     abab "^2.0.0"
     whatwg-mimetype "^2.2.0"
@@ -1590,161 +2307,186 @@ data-urls@^1.0.0:
 
 dateformat@^3.0.0:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@*, debug@3.1.0, debug@^3.1.0:
+debug@*, debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+debug@3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
+debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+debug@^3.1.0:
+  version "3.2.6"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
 debuglog@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
 decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 dedent@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
 deep-is@~0.1.3:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  dependencies:
-    strip-bom "^3.0.0"
+  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 defaults@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2:
+define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  resolved "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  resolved "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  resolved "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+deprecation@^2.0.0, deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
 detect-indent@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
 detect-newline@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
 dezalgo@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
 
-diff-sequences@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.0.0.tgz#cdf8e27ed20d8b8d3caccb4e0c0d8fe31a173013"
+diff-sequences@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
+  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
 
-dir-glob@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+dir-glob@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
   dependencies:
-    arrify "^1.0.1"
     path-type "^3.0.0"
 
 doctypes@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  resolved "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
 
 domexception@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  resolved "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
   dependencies:
     webidl-conversions "^4.0.2"
 
 dot-prop@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
   dependencies:
     is-obj "^1.0.0"
 
 dot-prop@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
     is-obj "^1.0.0"
 
 duplexer@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  version "3.7.1"
+  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -1752,112 +2494,150 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     stream-shift "^1.0.0"
 
 ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
 encoding@^0.1.11:
   version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  version "1.4.4"
+  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+env-paths@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
+  integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+
+envinfo@^7.3.1:
+  version "7.5.0"
+  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz#91410bb6db262fb4f1409bd506e9ff57e91023f4"
+  integrity sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==
 
 err-code@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  resolved "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
 
 errno@^0.1.1:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  resolved "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.5.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
+  version "1.17.4"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
+  integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==
   dependencies:
-    es-to-primitive "^1.2.0"
+    es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
-
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
 es6-promise@^4.0.3:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  version "4.2.8"
+  resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
 es6-promisify@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  resolved "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.9.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  version "1.14.1"
+  resolved "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
   dependencies:
-    esprima "^3.1.3"
+    esprima "^4.0.1"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
     source-map "~0.6.1"
 
-esprima@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
-esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+esprima@^4.0.0, esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-exec-sh@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
-  dependencies:
-    merge "^1.1.3"
+eventemitter3@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
+
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
 execa@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  resolved "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^4.0.0"
@@ -1869,11 +2649,13 @@ execa@^1.0.0:
 
 exit@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^2.1.4:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -1883,40 +2665,42 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-24.0.0.tgz#71f71d88a4202746fc79849bb4c6498008b5ef03"
+expect@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
+  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
   dependencies:
+    "@jest/types" "^24.9.0"
     ansi-styles "^3.2.0"
-    jest-get-type "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-regex-util "^24.0.0"
+    jest-get-type "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-regex-util "^24.9.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-extend@~3.0.2:
+extend@~3.0.0, extend@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -1924,7 +2708,8 @@ external-editor@^3.0.3:
 
 extglob@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -1937,19 +2722,23 @@ extglob@^2.0.4:
 
 extsprintf@1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
-fast-glob@^2.0.2:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
+fast-glob@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
   dependencies:
     "@mrmlnc/readdir-enhanced" "^2.2.1"
     "@nodelib/fs.stat" "^1.1.2"
@@ -1959,86 +2748,93 @@ fast-glob@^2.0.2:
     micromatch "^3.1.10"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.4:
+fast-levenshtein@~2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fb-watchman@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
   dependencies:
-    bser "^2.0.0"
+    bser "2.1.1"
 
 figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  resolved "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
 figures@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
-fileset@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 fill-range@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-find-npm-prefix@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
-
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
 flush-write-stream@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.4"
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
 
 for-in@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 forever-agent@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.1.1:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  resolved "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -2046,7 +2842,8 @@ form-data@~2.1.1:
 
 form-data@~2.3.2:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.6"
@@ -2054,42 +2851,39 @@ form-data@~2.3.2:
 
 fragment-cache@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 from2@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  resolved "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   dependencies:
-    graceful-fs "^4.1.2"
+    graceful-fs "^4.2.0"
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
 fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  dependencies:
-    minipass "^2.2.1"
-
-fs-vacuum@^1.2.10:
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
   dependencies:
-    graceful-fs "^4.1.2"
-    path-is-inside "^1.0.1"
-    rimraf "^2.5.2"
+    minipass "^2.6.0"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  resolved "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -2098,31 +2892,36 @@ fs-write-stream-atomic@^1.0.8:
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.3:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+fsevents@^1.2.7:
+  version "1.2.11"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
+  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
   dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
+    bindings "^1.5.0"
+    nan "^2.12.1"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+fstream@^1.0.2:
+  version "1.0.12"
+  resolved "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.0.2, function-bind@^1.1.1:
+function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  resolved "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -2135,28 +2934,23 @@ gauge@~2.7.3:
 
 genfun@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  resolved "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
-gentle-fs@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.0.1.tgz#585cfd612bfc5cd52471fdb42537f016a5ce3687"
-  dependencies:
-    aproba "^1.1.2"
-    fs-vacuum "^1.2.10"
-    graceful-fs "^4.1.11"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    path-is-inside "^1.0.2"
-    read-cmd-shim "^1.0.1"
-    slide "^1.1.6"
+gensync@^1.0.0-beta.1:
+  version "1.0.0-beta.1"
+  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
 
-get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -2164,13 +2958,15 @@ get-pkg-repo@^1.0.0:
     parse-github-repo-url "^1.3.0"
     through2 "^2.0.0"
 
-get-port@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
+get-port@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
+  integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
 
 get-repo@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-repo/-/get-repo-1.0.0.tgz#b14624bba917b677397d00feed98dd316a21b140"
+  resolved "https://registry.npmjs.org/get-repo/-/get-repo-1.0.0.tgz#b14624bba917b677397d00feed98dd316a21b140"
+  integrity sha1-sUYku6kXtnc5fQD+7ZjdMWohsUA=
   dependencies:
     barrage "^1.1.0"
     concat-stream "^1.4.7"
@@ -2180,27 +2976,32 @@ get-repo@^1.0.0:
 
 get-stdin@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  resolved "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 git-raw-commits@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  resolved "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -2210,38 +3011,66 @@ git-raw-commits@2.0.0:
 
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  resolved "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
   dependencies:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3"
+git-semver-tags@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.3.tgz#48988a718acf593800f99622a952a77c405bfa34"
+  integrity sha512-tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA==
   dependencies:
     meow "^4.0.0"
-    semver "^5.5.0"
+    semver "^6.0.0"
+
+git-up@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
+  integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw==
+  dependencies:
+    is-ssh "^1.3.0"
+    parse-url "^5.0.0"
+
+git-url-parse@^11.1.2:
+  version "11.1.2"
+  resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
+  integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
+  dependencies:
+    git-up "^4.0.0"
 
 gitconfiglocal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  resolved "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
   dependencies:
     ini "^1.3.2"
 
 glob-parent@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
+  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 glob@7.0.x:
   version "7.0.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -2250,20 +3079,10 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.1, glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+  version "7.1.6"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -2273,94 +3092,90 @@ glob@^7.1.1, glob@^7.1.3:
     path-is-absolute "^1.0.0"
 
 globals@^11.1.0:
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50"
-
-globby@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-graceful-fs@^4.1.15:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  version "11.12.0"
+  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globby@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
+  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^1.0.2"
+    dir-glob "^2.2.2"
+    fast-glob "^2.2.6"
+    glob "^7.1.3"
+    ignore "^4.0.3"
+    pify "^4.0.1"
+    slash "^2.0.0"
 
-"growl@~> 1.10.0":
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
 growly@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.0.11:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+handlebars@^4.4.0:
+  version "4.7.3"
+  resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
+  integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==
   dependencies:
-    async "^2.5.0"
+    neo-async "^2.6.0"
     optimist "^0.6.1"
     source-map "^0.6.1"
   optionalDependencies:
     uglify-js "^3.1.4"
 
-handlebars@^4.0.2:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
-  dependencies:
-    async "^1.4.0"
-    optimist "^0.6.1"
-    source-map "^0.4.4"
-  optionalDependencies:
-    uglify-js "^2.6"
-
 har-schema@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+  resolved "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+  integrity sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=
 
 har-schema@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~4.2.1:
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  resolved "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  integrity sha1-M0gdDxu/9gDdID11gSpqX7oALio=
   dependencies:
     ajv "^4.9.1"
     har-schema "^1.0.5"
 
-har-validator@~5.1.0:
+har-validator@~5.1.3:
   version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+has-symbols@^1.0.0, has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -2368,7 +3183,8 @@ has-value@^0.3.1:
 
 has-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  resolved "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -2376,30 +3192,28 @@ has-value@^1.0.0:
 
 has-values@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  resolved "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  resolved "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  dependencies:
-    function-bind "^1.0.2"
-
 has@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hawk@~3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  resolved "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -2408,47 +3222,56 @@ hawk@~3.1.3:
 
 hoek@2.x.x:
   version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  resolved "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
-hosted-git-info@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
-
-hosted-git-info@^2.6.0:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
+  version "2.8.8"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
   dependencies:
     whatwg-encoding "^1.0.1"
 
+html-escaper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
+  integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
+
 http-basic@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-basic/-/http-basic-1.1.1.tgz#caf71e9f7d54eebee550eec9b6351d0c68a9b886"
+  resolved "https://registry.npmjs.org/http-basic/-/http-basic-1.1.1.tgz#caf71e9f7d54eebee550eec9b6351d0c68a9b886"
+  integrity sha1-yvcen31U7r7lUO7JtjUdDGipuIY=
   dependencies:
     concat-stream "^1.4.6"
     http-response-object "^1.0.0"
 
 http-cache-semantics@^3.8.1:
   version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
 
 http-response-object@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-1.1.0.tgz#a7c4e75aae82f3bb4904e4f43f615673b4d518c3"
+  resolved "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz#a7c4e75aae82f3bb4904e4f43f615673b4d518c3"
+  integrity sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=
 
 http-signature@~1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -2456,106 +3279,117 @@ http-signature@~1.1.0:
 
 http-signature@~1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+https-proxy-agent@^2.2.3:
+  version "2.2.4"
+  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 humanize-ms@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  resolved "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iferr@^0.1.5:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  resolved "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.5:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+ignore@^4.0.3:
+  version "4.0.6"
+  resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 image-size@~0.5.0:
   version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 import-fresh@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
   dependencies:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-local@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
-  dependencies:
-    pkg-dir "^2.0.0"
-    resolve-cwd "^2.0.0"
-
 import-local@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  resolved "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
   dependencies:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 indent-string@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  resolved "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  resolved "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
+
+infer-owner@^1.0.3, infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
 inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.2, ini@^1.3.4:
   version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  resolved "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 init-package-json@^1.10.3:
   version "1.10.3"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
+  resolved "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
+  integrity sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==
   dependencies:
     glob "^7.1.1"
     npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0"
@@ -2567,8 +3401,9 @@ init-package-json@^1.10.3:
     validate-npm-package-name "^3.0.0"
 
 inquirer@^6.2.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
+  version "6.5.2"
+  resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -2576,94 +3411,85 @@ inquirer@^6.2.0:
     cli-width "^2.0.0"
     external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.12"
     mute-stream "0.0.7"
     run-async "^2.2.0"
     rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 invariant@^2.2.4:
   version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.5:
+ip@1.1.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-buffer@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-ci@^1.0.10:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
-  dependencies:
-    ci-info "^1.0.0"
+is-callable@^1.1.4, is-callable@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
 is-ci@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  resolved "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
     ci-info "^2.0.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
 is-descriptor@^0.1.0:
   version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -2671,7 +3497,8 @@ is-descriptor@^0.1.0:
 
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -2679,536 +3506,617 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 
 is-directory@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  resolved "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-expression@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  resolved "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  integrity sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=
   dependencies:
     acorn "~4.0.2"
     object-assign "^4.0.1"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
-is-extendable@^1.0.1:
+is-extendable@^1.0.0, is-extendable@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  dependencies:
-    number-is-nan "^1.0.0"
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-generator-fn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e"
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-glob@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+is-glob@^4.0.0, is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-number@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
+  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
+  dependencies:
+    isobject "^4.0.0"
+
 is-promise@^2.0.0, is-promise@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
-is-regex@^1.0.3, is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+is-regex@^1.0.3, is-regex@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  dependencies:
+    has "^1.0.3"
+
+is-ssh@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
+  integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==
   dependencies:
-    has "^1.0.1"
+    protocols "^1.1.0"
 
 is-stream@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
   dependencies:
-    has-symbols "^1.0.0"
+    has-symbols "^1.0.1"
 
-is-text-path@^1.0.0:
+is-text-path@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  resolved "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
     text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-windows@^1.0.2:
+is-windows@^1.0.0, is-windows@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isobject@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
+  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
 
 isstream@~0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-api@^2.0.8:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.0.tgz#37ab0c2c3e83065462f5254b94749d6157846c4e"
-  dependencies:
-    async "^2.6.1"
-    compare-versions "^3.2.1"
-    fileset "^2.0.3"
-    istanbul-lib-coverage "^2.0.3"
-    istanbul-lib-hook "^2.0.3"
-    istanbul-lib-instrument "^3.1.0"
-    istanbul-lib-report "^2.0.4"
-    istanbul-lib-source-maps "^3.0.2"
-    istanbul-reports "^2.1.0"
-    js-yaml "^3.12.0"
-    make-dir "^1.3.0"
-    minimatch "^3.0.4"
-    once "^1.4.0"
-
-istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
-
-istanbul-lib-hook@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.3.tgz#e0e581e461c611be5d0e5ef31c5f0109759916fb"
-  dependencies:
-    append-transform "^1.0.0"
+istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
-istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz#a2b5484a7d445f1f311e93190813fa56dfb62971"
+istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
   dependencies:
-    "@babel/generator" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    istanbul-lib-coverage "^2.0.3"
-    semver "^5.5.0"
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
+    semver "^6.0.0"
 
 istanbul-lib-report@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz#bfd324ee0c04f59119cb4f07dab157d09f24d7e4"
+  version "2.0.8"
+  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
   dependencies:
-    istanbul-lib-coverage "^2.0.3"
-    make-dir "^1.3.0"
-    supports-color "^6.0.0"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    supports-color "^6.1.0"
 
-istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz#f1e817229a9146e8424a28e5d69ba220fda34156"
+istanbul-lib-source-maps@^3.0.1:
+  version "3.0.6"
+  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
   dependencies:
     debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.3"
-    make-dir "^1.3.0"
-    rimraf "^2.6.2"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    rimraf "^2.6.3"
     source-map "^0.6.1"
 
-istanbul-reports@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.1.0.tgz#87b8b55cd1901ba1748964c98ddd8900ce306d59"
+istanbul-reports@^2.2.6:
+  version "2.2.7"
+  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
+  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
   dependencies:
-    handlebars "^4.0.11"
+    html-escaper "^2.0.0"
 
-jest-changed-files@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.0.0.tgz#c02c09a8cc9ca93f513166bc773741bd39898ff7"
+jest-changed-files@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
+  integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==
   dependencies:
+    "@jest/types" "^24.9.0"
     execa "^1.0.0"
     throat "^4.0.0"
 
-jest-cli@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.0.0.tgz#691fd4f7bce2574c1865db6844a43b56e60ce2a4"
+jest-cli@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af"
+  integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==
   dependencies:
-    ansi-escapes "^3.0.0"
+    "@jest/core" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.1.15"
     import-local "^2.0.0"
     is-ci "^2.0.0"
-    istanbul-api "^2.0.8"
-    istanbul-lib-coverage "^2.0.2"
-    istanbul-lib-instrument "^3.0.1"
-    istanbul-lib-source-maps "^3.0.1"
-    jest-changed-files "^24.0.0"
-    jest-config "^24.0.0"
-    jest-environment-jsdom "^24.0.0"
-    jest-get-type "^24.0.0"
-    jest-haste-map "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-regex-util "^24.0.0"
-    jest-resolve-dependencies "^24.0.0"
-    jest-runner "^24.0.0"
-    jest-runtime "^24.0.0"
-    jest-snapshot "^24.0.0"
-    jest-util "^24.0.0"
-    jest-validate "^24.0.0"
-    jest-watcher "^24.0.0"
-    jest-worker "^24.0.0"
-    micromatch "^3.1.10"
-    node-notifier "^5.2.1"
-    p-each-series "^1.0.0"
-    pirates "^4.0.0"
+    jest-config "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
     prompts "^2.0.1"
-    realpath-native "^1.0.0"
-    rimraf "^2.5.4"
-    slash "^2.0.0"
-    string-length "^2.0.0"
-    strip-ansi "^5.0.0"
-    which "^1.2.12"
-    yargs "^12.0.2"
+    realpath-native "^1.1.0"
+    yargs "^13.3.0"
 
-jest-config@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.0.0.tgz#878abe03c060c74a0ec30d3cd5dd1897873e030e"
+jest-config@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5"
+  integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==
   dependencies:
     "@babel/core" "^7.1.0"
-    babel-jest "^24.0.0"
+    "@jest/test-sequencer" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    babel-jest "^24.9.0"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^24.0.0"
-    jest-environment-node "^24.0.0"
-    jest-get-type "^24.0.0"
-    jest-jasmine2 "^24.0.0"
-    jest-regex-util "^24.0.0"
-    jest-resolve "^24.0.0"
-    jest-util "^24.0.0"
-    jest-validate "^24.0.0"
+    jest-environment-jsdom "^24.9.0"
+    jest-environment-node "^24.9.0"
+    jest-get-type "^24.9.0"
+    jest-jasmine2 "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
     micromatch "^3.1.10"
-    pretty-format "^24.0.0"
-    realpath-native "^1.0.2"
-    uuid "^3.3.2"
+    pretty-format "^24.9.0"
+    realpath-native "^1.1.0"
 
-jest-diff@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.0.0.tgz#a3e5f573dbac482f7d9513ac9cfa21644d3d6b34"
+jest-diff@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
+  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
   dependencies:
     chalk "^2.0.1"
-    diff-sequences "^24.0.0"
-    jest-get-type "^24.0.0"
-    pretty-format "^24.0.0"
+    diff-sequences "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-docblock@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.0.0.tgz#54d77a188743e37f62181a91a01eb9222289f94e"
+jest-docblock@^24.3.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
+  integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.0.0.tgz#10987a06b21c7ffbfb7706c89d24c52ed864be55"
+jest-each@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05"
+  integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==
   dependencies:
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
-    jest-get-type "^24.0.0"
-    jest-util "^24.0.0"
-    pretty-format "^24.0.0"
-
-jest-environment-jsdom@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.0.0.tgz#5affa0654d6e44cd798003daa1a8701dbd6e4d11"
-  dependencies:
-    jest-mock "^24.0.0"
-    jest-util "^24.0.0"
+    jest-get-type "^24.9.0"
+    jest-util "^24.9.0"
+    pretty-format "^24.9.0"
+
+jest-environment-jsdom@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b"
+  integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==
+  dependencies:
+    "@jest/environment" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-util "^24.9.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.0.0.tgz#330948980656ed8773ce2e04eb597ed91e3c7190"
+jest-environment-node@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3"
+  integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==
   dependencies:
-    jest-mock "^24.0.0"
-    jest-util "^24.0.0"
+    "@jest/environment" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-util "^24.9.0"
 
-jest-get-type@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.0.0.tgz#36e72930b78e33da59a4f63d44d332188278940b"
+jest-get-type@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
+  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
 
-jest-haste-map@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.0.0.tgz#e9ef51b2c9257384b4d6beb83bd48c65b37b5e6e"
+jest-haste-map@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
+  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
   dependencies:
+    "@jest/types" "^24.9.0"
+    anymatch "^2.0.0"
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.15"
     invariant "^2.2.4"
-    jest-serializer "^24.0.0"
-    jest-util "^24.0.0"
-    jest-worker "^24.0.0"
+    jest-serializer "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.9.0"
     micromatch "^3.1.10"
-    sane "^3.0.0"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^1.2.7"
 
-jest-jasmine2@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.0.0.tgz#7d87be9d8b32d34ac5980ad646b7ae7f99e33a19"
+jest-jasmine2@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
+  integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==
   dependencies:
     "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^24.0.0"
+    expect "^24.9.0"
     is-generator-fn "^2.0.0"
-    jest-each "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-snapshot "^24.0.0"
-    jest-util "^24.0.0"
-    pretty-format "^24.0.0"
+    jest-each "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    pretty-format "^24.9.0"
+    throat "^4.0.0"
 
-jest-leak-detector@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.0.0.tgz#78280119fd05ee98317daee62cddb3aa537a31c6"
+jest-leak-detector@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a"
+  integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==
   dependencies:
-    pretty-format "^24.0.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-matcher-utils@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.0.0.tgz#fc9c41cfc49b2c3ec14e576f53d519c37729d579"
+jest-matcher-utils@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
+  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
   dependencies:
     chalk "^2.0.1"
-    jest-diff "^24.0.0"
-    jest-get-type "^24.0.0"
-    pretty-format "^24.0.0"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-message-util@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.0.0.tgz#a07a141433b2c992dbaec68d4cbfe470ba289619"
+jest-message-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
+  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/stack-utils" "^1.0.1"
     chalk "^2.0.1"
     micromatch "^3.1.10"
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.0.0.tgz#9a4b53e01d66a0e780f7d857462d063e024c617d"
+jest-mock@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
+  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
+  dependencies:
+    "@jest/types" "^24.9.0"
+
+jest-pnp-resolver@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
+  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
 
-jest-regex-util@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.0.0.tgz#4feee8ec4a358f5bee0a654e94eb26163cb9089a"
+jest-regex-util@^24.3.0, jest-regex-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
+  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
 
-jest-resolve-dependencies@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.0.0.tgz#86540611d660bdcaab8b87d069247d3832811d94"
+jest-resolve-dependencies@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
+  integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==
   dependencies:
-    jest-regex-util "^24.0.0"
-    jest-snapshot "^24.0.0"
+    "@jest/types" "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-snapshot "^24.9.0"
 
-jest-resolve@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.0.0.tgz#0206cfe842324f8796b01f706f4075309bf7b405"
+jest-resolve@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321"
+  integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==
   dependencies:
+    "@jest/types" "^24.9.0"
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
-    realpath-native "^1.0.0"
-
-jest-runner@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.0.0.tgz#00b280d52d23286111a8ed0362ed958283f7f0e3"
-  dependencies:
+    jest-pnp-resolver "^1.2.1"
+    realpath-native "^1.1.0"
+
+jest-runner@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42"
+  integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    chalk "^2.4.2"
     exit "^0.1.2"
     graceful-fs "^4.1.15"
-    jest-config "^24.0.0"
-    jest-docblock "^24.0.0"
-    jest-haste-map "^24.0.0"
-    jest-jasmine2 "^24.0.0"
-    jest-leak-detector "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-runtime "^24.0.0"
-    jest-util "^24.0.0"
-    jest-worker "^24.0.0"
+    jest-config "^24.9.0"
+    jest-docblock "^24.3.0"
+    jest-haste-map "^24.9.0"
+    jest-jasmine2 "^24.9.0"
+    jest-leak-detector "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-resolve "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.6.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.0.0.tgz#bc80756f5458c2c8e4db86f44b687ff692026c13"
-  dependencies:
-    "@babel/core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
+jest-runtime@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac"
+  integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.9.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/yargs" "^13.0.0"
     chalk "^2.0.1"
-    convert-source-map "^1.4.0"
     exit "^0.1.2"
-    fast-json-stable-stringify "^2.0.0"
     glob "^7.1.3"
     graceful-fs "^4.1.15"
-    jest-config "^24.0.0"
-    jest-haste-map "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-regex-util "^24.0.0"
-    jest-resolve "^24.0.0"
-    jest-snapshot "^24.0.0"
-    jest-util "^24.0.0"
-    jest-validate "^24.0.0"
-    micromatch "^3.1.10"
-    realpath-native "^1.0.0"
+    jest-config "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    realpath-native "^1.1.0"
     slash "^2.0.0"
-    strip-bom "3.0.0"
-    write-file-atomic "^2.4.2"
-    yargs "^12.0.2"
+    strip-bom "^3.0.0"
+    yargs "^13.3.0"
 
-jest-serializer@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.0.0.tgz#522c44a332cdd194d8c0531eb06a1ee5afb4256b"
+jest-serializer@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
+  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
 
-jest-snapshot@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.0.0.tgz#fb447a753a3271660b3d89d068698014eb14c414"
+jest-snapshot@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
+  integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==
   dependencies:
     "@babel/types" "^7.0.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
-    jest-diff "^24.0.0"
-    jest-matcher-utils "^24.0.0"
-    jest-message-util "^24.0.0"
-    jest-resolve "^24.0.0"
+    expect "^24.9.0"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-resolve "^24.9.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^24.0.0"
-    semver "^5.5.0"
-
-jest-util@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.0.0.tgz#fd38fcafd6dedbd0af2944d7a227c0d91b68f7d6"
-  dependencies:
+    pretty-format "^24.9.0"
+    semver "^6.2.0"
+
+jest-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
+  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
+  dependencies:
+    "@jest/console" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/source-map" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
     callsites "^3.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.15"
     is-ci "^2.0.0"
-    jest-message-util "^24.0.0"
     mkdirp "^0.5.1"
     slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-validate@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.0.0.tgz#aa8571a46983a6538328fef20406b4a496b6c020"
+jest-validate@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
+  integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==
   dependencies:
-    camelcase "^5.0.0"
+    "@jest/types" "^24.9.0"
+    camelcase "^5.3.1"
     chalk "^2.0.1"
-    jest-get-type "^24.0.0"
-    leven "^2.1.0"
-    pretty-format "^24.0.0"
-
-jest-watcher@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.0.0.tgz#20d44244d10b0b7312410aefd256c1c1eef68890"
-  dependencies:
+    jest-get-type "^24.9.0"
+    leven "^3.1.0"
+    pretty-format "^24.9.0"
+
+jest-watcher@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b"
+  integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==
+  dependencies:
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/yargs" "^13.0.0"
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
-    jest-util "^24.0.0"
+    jest-util "^24.9.0"
     string-length "^2.0.0"
 
-jest-worker@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.0.0.tgz#3d3483b077bf04f412f47654a27bba7e947f8b6d"
+jest-worker@^24.6.0, jest-worker@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
   dependencies:
-    merge-stream "^1.0.1"
+    merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
-jest@24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-24.0.0.tgz#b8e2c8e6274e1092c7f56e57762a1fdc7800201e"
+jest@24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
+  integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==
   dependencies:
     import-local "^2.0.0"
-    jest-cli "^24.0.0"
+    jest-cli "^24.9.0"
 
-js-stringify@^1.0.1:
+js-stringify@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
-
-js-tokens@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  resolved "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+  integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
 
-js-tokens@^4.0.0:
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.9.0:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
+js-yaml@^3.13.1:
+  version "3.13.1"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
 jsbn@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsdom@^11.5.1:
   version "11.12.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+  resolved "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
   dependencies:
     abab "^2.0.0"
     acorn "^5.5.3"
@@ -3239,57 +4147,64 @@ jsdom@^11.5.1:
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-parse-better-errors@^1.0.0:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-
-json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+  resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stable-stringify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  resolved "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
   dependencies:
     jsonify "~0.0.0"
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
+  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
   dependencies:
-    minimist "^1.2.0"
+    minimist "^1.2.5"
 
 jsonfile@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonify@~0.0.0:
   version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsonparse@^1.2.0:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsprim@^1.2.2:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -3298,256 +4213,185 @@ jsprim@^1.2.2:
 
 jstransformer-cdata@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jstransformer-cdata/-/jstransformer-cdata-1.0.0.tgz#3c15f0696478d39a4564a33010094b90b7ee9fb6"
+  resolved "https://registry.npmjs.org/jstransformer-cdata/-/jstransformer-cdata-1.0.0.tgz#3c15f0696478d39a4564a33010094b90b7ee9fb6"
+  integrity sha1-PBXwaWR405pFZKMwEAlLkLfun7Y=
 
-jstransformer-coffee-script@^1.0.0:
+jstransformer-coffee-script@^1.0.0, jstransformer-coffee-script@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/jstransformer-coffee-script/-/jstransformer-coffee-script-1.1.1.tgz#6455eb2f8b26fdff2abeb1b3c9875e6b1f4f8fa6"
+  resolved "https://registry.npmjs.org/jstransformer-coffee-script/-/jstransformer-coffee-script-1.1.1.tgz#6455eb2f8b26fdff2abeb1b3c9875e6b1f4f8fa6"
+  integrity sha1-ZFXrL4sm/f8qvrGzyYdeax9Pj6Y=
   dependencies:
     coffee-script "~1.12.7"
     merge "^1.2.0"
 
-jstransformer-less@^2.1.0:
+jstransformer-less@^2.1.0, jstransformer-less@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/jstransformer-less/-/jstransformer-less-2.3.0.tgz#ac3a2f8ad688d73179495bbab85c7216ad5608eb"
+  resolved "https://registry.npmjs.org/jstransformer-less/-/jstransformer-less-2.3.0.tgz#ac3a2f8ad688d73179495bbab85c7216ad5608eb"
+  integrity sha1-rDovitaI1zF5SVu6uFxyFq1WCOs=
   dependencies:
     less "^2.3.1"
     less-plugin-inline-urls "^1.1.0"
     less-plugin-npm-import "^2.0.0"
 
-jstransformer-markdown-it@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jstransformer-markdown-it/-/jstransformer-markdown-it-1.0.0.tgz#4138c5fd04149e10e529408d35526b3a6f7724ef"
+jstransformer-markdown-it@2.0.0, jstransformer-markdown-it@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/jstransformer-markdown-it/-/jstransformer-markdown-it-2.0.0.tgz#8b44aedbc9465dc935d280be90339b671c16ceb8"
+  integrity sha1-i0Su28lGXck10oC+kDObZxwWzrg=
   dependencies:
-    markdown-it "^7.0.0"
+    markdown-it "^8.0.0"
 
-jstransformer-stylus@^1.0.0:
+jstransformer-stylus@^1.0.0, jstransformer-stylus@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/jstransformer-stylus/-/jstransformer-stylus-1.5.0.tgz#9e65a9225eda4bd586c5da69d3d3d8661018ebf7"
+  resolved "https://registry.npmjs.org/jstransformer-stylus/-/jstransformer-stylus-1.5.0.tgz#9e65a9225eda4bd586c5da69d3d3d8661018ebf7"
+  integrity sha1-nmWpIl7aS9WGxdpp09PYZhAY6/c=
   dependencies:
     clone "^2.0.0"
     stylus "~0.54.5"
 
-jstransformer-uglify-js@^1.1.1:
+jstransformer-uglify-js@^1.1.1, jstransformer-uglify-js@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/jstransformer-uglify-js/-/jstransformer-uglify-js-1.2.0.tgz#f26b5fb2a99bb0f5354f884cb50b5914bc5224a8"
+  resolved "https://registry.npmjs.org/jstransformer-uglify-js/-/jstransformer-uglify-js-1.2.0.tgz#f26b5fb2a99bb0f5354f884cb50b5914bc5224a8"
+  integrity sha1-8mtfsqmbsPU1T4hMtQtZFLxSJKg=
   dependencies:
     uglify-js "^2.8.10"
 
 jstransformer-verbatim@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/jstransformer-verbatim/-/jstransformer-verbatim-1.1.1.tgz#8cda3f804146ac5f0f70bcc5b60a0cc79f8c4d94"
+  resolved "https://registry.npmjs.org/jstransformer-verbatim/-/jstransformer-verbatim-1.1.1.tgz#8cda3f804146ac5f0f70bcc5b60a0cc79f8c4d94"
+  integrity sha1-jNo/gEFGrF8PcLzFtgoMx5+MTZQ=
 
 jstransformer@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  resolved "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
   dependencies:
     is-promise "^2.0.0"
     promise "^7.0.1"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  version "6.0.3"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-kleur@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.1.tgz#4f5b313f5fa315432a400f19a24db78d451ede62"
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 lazy-cache@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  dependencies:
-    invert-kv "^2.0.0"
+  resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
-lcov-parse@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
+lcov-parse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
+  integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=
 
 left-pad@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
-
-lerna@3.10.8:
-  version "3.10.8"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.10.8.tgz#89e04b5e29f7d6acb3cec7ce59cec2d4343e5cf4"
-  dependencies:
-    "@lerna/add" "3.10.6"
-    "@lerna/bootstrap" "3.10.6"
-    "@lerna/changed" "3.10.8"
-    "@lerna/clean" "3.10.6"
-    "@lerna/cli" "3.10.7"
-    "@lerna/create" "3.10.6"
-    "@lerna/diff" "3.10.6"
-    "@lerna/exec" "3.10.6"
-    "@lerna/import" "3.10.6"
-    "@lerna/init" "3.10.6"
-    "@lerna/link" "3.10.6"
-    "@lerna/list" "3.10.6"
-    "@lerna/publish" "3.10.8"
-    "@lerna/run" "3.10.6"
-    "@lerna/version" "3.10.8"
-    import-local "^1.0.0"
-    libnpm "^2.0.1"
-
-less-plugin-inline-urls@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/less-plugin-inline-urls/-/less-plugin-inline-urls-1.2.0.tgz#5ddab07a0c2571f1a2855cf929ddc9efc1e38acc"
-
-less-plugin-npm-import@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
-  dependencies:
-    promise "~7.0.1"
-    resolve "~1.1.6"
-
-less@^2.3.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    mime "^1.2.11"
-    mkdirp "^0.5.0"
-    promise "^7.1.1"
-    request "2.81.0"
-    source-map "^0.5.3"
-
-leven@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
-
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-libnpm@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/libnpm/-/libnpm-2.0.1.tgz#a48fcdee3c25e13c77eb7c60a0efe561d7fb0d8f"
-  dependencies:
-    bin-links "^1.1.2"
-    bluebird "^3.5.3"
-    find-npm-prefix "^1.0.2"
-    libnpmaccess "^3.0.1"
-    libnpmconfig "^1.2.1"
-    libnpmhook "^5.0.2"
-    libnpmorg "^1.0.0"
-    libnpmpublish "^1.1.0"
-    libnpmsearch "^2.0.0"
-    libnpmteam "^1.0.1"
-    lock-verify "^2.0.2"
-    npm-lifecycle "^2.1.0"
-    npm-logical-tree "^1.2.1"
-    npm-package-arg "^6.1.0"
-    npm-profile "^4.0.1"
-    npm-registry-fetch "^3.8.0"
-    npmlog "^4.1.2"
-    pacote "^9.2.3"
-    read-package-json "^2.0.13"
-    stringify-package "^1.0.0"
-
-libnpmaccess@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8"
-  dependencies:
-    aproba "^2.0.0"
-    get-stream "^4.0.0"
-    npm-package-arg "^6.1.0"
-    npm-registry-fetch "^3.8.0"
-
-libnpmconfig@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"
-  dependencies:
-    figgy-pudding "^3.5.1"
-    find-up "^3.0.0"
-    ini "^1.3.5"
-
-libnpmhook@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-5.0.2.tgz#d12817b0fb893f36f1d5be20017f2aea25825d94"
-  dependencies:
-    aproba "^2.0.0"
-    figgy-pudding "^3.4.1"
-    get-stream "^4.0.0"
-    npm-registry-fetch "^3.8.0"
-
-libnpmorg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232"
-  dependencies:
-    aproba "^2.0.0"
-    figgy-pudding "^3.4.1"
-    get-stream "^4.0.0"
-    npm-registry-fetch "^3.8.0"
-
-libnpmpublish@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.1.tgz#ff0c6bb0b4ad2bda2ad1f5fba6760a4af37125f0"
-  dependencies:
-    aproba "^2.0.0"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.0.0"
-    lodash.clonedeep "^4.5.0"
-    normalize-package-data "^2.4.0"
-    npm-package-arg "^6.1.0"
-    npm-registry-fetch "^3.8.0"
-    semver "^5.5.1"
-    ssri "^6.0.1"
+  resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
+
+lerna@3.20.2:
+  version "3.20.2"
+  resolved "https://registry.npmjs.org/lerna/-/lerna-3.20.2.tgz#abf84e73055fe84ee21b46e64baf37b496c24864"
+  integrity sha512-bjdL7hPLpU3Y8CBnw/1ys3ynQMUjiK6l9iDWnEGwFtDy48Xh5JboR9ZJwmKGCz9A/sarVVIGwf1tlRNKUG9etA==
+  dependencies:
+    "@lerna/add" "3.20.0"
+    "@lerna/bootstrap" "3.20.0"
+    "@lerna/changed" "3.20.0"
+    "@lerna/clean" "3.20.0"
+    "@lerna/cli" "3.18.5"
+    "@lerna/create" "3.18.5"
+    "@lerna/diff" "3.18.5"
+    "@lerna/exec" "3.20.0"
+    "@lerna/import" "3.18.5"
+    "@lerna/info" "3.20.0"
+    "@lerna/init" "3.18.5"
+    "@lerna/link" "3.18.5"
+    "@lerna/list" "3.20.0"
+    "@lerna/publish" "3.20.2"
+    "@lerna/run" "3.20.0"
+    "@lerna/version" "3.20.2"
+    import-local "^2.0.0"
+    npmlog "^4.1.2"
 
-libnpmsearch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.0.tgz#de05af47ada81554a5f64276a69599070d4a5685"
+less-plugin-inline-urls@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/less-plugin-inline-urls/-/less-plugin-inline-urls-1.2.0.tgz#5ddab07a0c2571f1a2855cf929ddc9efc1e38acc"
+  integrity sha1-XdqwegwlcfGihVz5Kd3J78Hjisw=
+
+less-plugin-npm-import@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
   dependencies:
-    figgy-pudding "^3.5.1"
-    get-stream "^4.0.0"
-    npm-registry-fetch "^3.8.0"
+    promise "~7.0.1"
+    resolve "~1.1.6"
 
-libnpmteam@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213"
+less@^2.3.1:
+  version "2.7.3"
+  resolved "https://registry.npmjs.org/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
+  integrity sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.2.11"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "2.81.0"
+    source-map "^0.5.3"
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
-    aproba "^2.0.0"
-    figgy-pudding "^3.4.1"
-    get-stream "^4.0.0"
-    npm-registry-fetch "^3.8.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
 
-line-json@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/line-json/-/line-json-1.0.0.tgz#6b40439bc8f41f666076daedeced1b1c68347669"
+line-json@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/line-json/-/line-json-2.0.0.tgz#9236a5403ceb92d8659b73dfee3f3d229eab518d"
+  integrity sha1-kjalQDzrkthlm3Pf7j89Ip6rUY0=
 
 linkify-it@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
   dependencies:
     uc.micro "^1.0.1"
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3557,119 +4401,164 @@ load-json-file@^1.0.0:
 
 load-json-file@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz#4d3c1e01fa1c03ea78a60ac7af932c9ce53403f3"
+  integrity sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==
+  dependencies:
+    graceful-fs "^4.1.15"
+    parse-json "^4.0.0"
+    pify "^4.0.1"
+    strip-bom "^3.0.0"
+    type-fest "^0.3.0"
+
 locate-path@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
 locate-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lock-verify@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.0.2.tgz#148e4f85974915c9e3c34d694b7de9ecb18ee7a8"
-  dependencies:
-    npm-package-arg "^5.1.2 || 6"
-    semver "^5.4.1"
-
-lodash._reinterpolate@~3.0.0:
+lodash._reinterpolate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
+lodash.clone@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+  integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
 
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  resolved "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
+
+lodash.set@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
+  integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.template@^4.0.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+lodash.template@^4.0.2, lodash.template@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
     lodash.templatesettings "^4.0.0"
 
 lodash.templatesettings@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  version "4.2.0"
+  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
+  version "4.17.15"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
 log-driver@^1.2.7:
   version "1.2.7"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
+  resolved "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
+  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
 
 longest@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
 loose-envify@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
-    js-tokens "^3.0.0"
+    js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  resolved "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lru-cache@^4.1.2, lru-cache@^4.1.3:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
 lru-cache@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
     yallist "^3.0.2"
 
+macos-release@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f"
+  integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==
+
 make-dir@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
-make-dir@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+make-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
   dependencies:
-    pify "^3.0.0"
+    pify "^4.0.1"
+    semver "^5.6.0"
 
-make-fetch-happen@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+make-fetch-happen@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
+  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
   dependencies:
     agentkeepalive "^3.4.1"
-    cacache "^11.0.1"
+    cacache "^12.0.0"
     http-cache-semantics "^3.8.1"
     http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    lru-cache "^4.1.2"
+    https-proxy-agent "^2.2.3"
+    lru-cache "^5.1.1"
     mississippi "^3.0.0"
     node-fetch-npm "^2.0.2"
     promise-retry "^1.1.1"
@@ -3678,59 +4567,53 @@ make-fetch-happen@^4.0.1:
 
 makeerror@1.0.x:
   version "1.0.11"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
   dependencies:
     tmpl "1.0.x"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.2:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+  resolved "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
 map-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  resolved "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-7.0.1.tgz#f12d8b88a93e64254348dfd183bd70bf60567a42"
+markdown-it@^8.0.0:
+  version "8.4.2"
+  resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
+  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
   dependencies:
     argparse "^1.0.7"
     entities "~1.1.1"
     linkify-it "^2.0.0"
     mdurl "^1.0.1"
-    uc.micro "^1.0.1"
+    uc.micro "^1.0.5"
 
 mdurl@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-
-mem@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.1.0.tgz#aeb9be2d21f47e78af29e4ac5978e8afa2ca5b8a"
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^2.0.0"
+  resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
 meow@^3.3.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -3744,8 +4627,9 @@ meow@^3.3.0:
     trim-newlines "^1.0.0"
 
 meow@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.0.tgz#fd5855dd008db5b92c552082db1c307cba20b29d"
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -3757,23 +4641,40 @@ meow@^4.0.0:
     redent "^2.0.0"
     trim-newlines "^2.0.0"
 
-merge-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+meow@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
+  integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
   dependencies:
-    readable-stream "^2.0.1"
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+    yargs-parser "^10.0.0"
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-merge@^1.1.3, merge@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+merge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -3789,75 +4690,77 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@~1.33.0:
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-
-mime-db@~1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-  dependencies:
-    mime-db "~1.33.0"
+mime-db@1.43.0:
+  version "1.43.0"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
+  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
 
-mime-types@~2.1.19:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.7:
+  version "2.1.26"
+  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
+  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
   dependencies:
-    mime-db "~1.37.0"
+    mime-db "1.43.0"
 
 mime@^1.2.11:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minimist@~0.0.1:
   version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
   dependencies:
-    minipass "^2.2.1"
+    minipass "^2.9.0"
 
 mississippi@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  resolved "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -3871,25 +4774,44 @@ mississippi@^3.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mixin-object@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/mixin-object/-/mixin-object-3.0.0.tgz#55091196c9cf744f4c7956fb7021da38c736c440"
+  integrity sha512-RsUqTd3DyF9+UPqhLzJIWwGm4ZGIPYOu6WcQhQuBqqVBGhc6LOC8LrFk9KD7PvVwmqri45IJT88WLrNNrMWjxg==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.0"
+
+mkdirp-promise@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
+  integrity sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=
+  dependencies:
+    mkdirp "*"
+
+mkdirp@*, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 modify-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  resolved "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -3900,36 +4822,52 @@ move-concurrently@^1.0.1:
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.0.0, ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-multimatch@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+multimatch@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b"
+  integrity sha512-22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA==
   dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
+    array-differ "^2.0.3"
+    array-union "^1.0.2"
+    arrify "^1.0.1"
+    minimatch "^3.0.4"
 
 mute-stream@0.0.7:
   version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 mute-stream@~0.0.4:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.9.2:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
+mz@^2.5.0:
+  version "2.7.0"
+  resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+nan@^2.12.1:
+  version "2.14.0"
+  resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
 
 nanomatch@^1.2.9:
   version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -3945,187 +4883,166 @@ nanomatch@^1.2.9:
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
+neo-async@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
 nice-try@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch-npm@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.3.tgz#efae4aacb0500444e449a51fc1467397775ebc38"
+  integrity sha512-DgwoKEsqLnFZtk3ap7GWBHcHwnUhsNmQqEDcdjfQ8GofLEFJ081NAd4Uin3R7RFZBWVJCwHISw1oaEqPgSLloA==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+node-fetch@^2.3.0, node-fetch@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
+node-gyp@^5.0.2:
+  version "5.1.0"
+  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.0.tgz#8e31260a7af4a2e2f994b0673d4e0b3866156332"
+  integrity sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==
   dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.2"
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.1.2"
+    request "^2.88.0"
+    rimraf "^2.6.3"
+    semver "^5.7.1"
+    tar "^4.4.12"
+    which "^1.3.1"
 
 node-int64@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-modules-regexp@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  resolved "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
-node-notifier@^5.2.1:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.3.0.tgz#c77a4a7b84038733d5fb351aafd8a268bfe19a01"
+node-notifier@^5.4.2:
+  version "5.4.3"
+  resolved "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
   dependencies:
     growly "^1.3.0"
+    is-wsl "^1.1.0"
     semver "^5.5.0"
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-"nopt@2 || 3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
 nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  version "4.0.3"
+  resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.4.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.2.tgz#6b2abd85774e51f7936f1395e45acb905dc849b2"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
+    resolve "^1.10.0"
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-url@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
+
 npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
 
-npm-lifecycle@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
+npm-lifecycle@^3.1.2:
+  version "3.1.4"
+  resolved "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz#de6975c7d8df65f5150db110b57cce498b0b604c"
+  integrity sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==
   dependencies:
     byline "^5.0.0"
-    graceful-fs "^4.1.11"
-    node-gyp "^3.8.0"
+    graceful-fs "^4.1.15"
+    node-gyp "^5.0.2"
     resolve-from "^4.0.0"
     slide "^1.1.6"
     uid-number "0.0.6"
     umask "^1.1.0"
     which "^1.3.1"
 
-npm-logical-tree@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88"
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^5.1.2 || 6", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
   dependencies:
-    hosted-git-info "^2.6.0"
+    hosted-git-info "^2.7.1"
     osenv "^0.1.5"
-    semver "^5.5.0"
+    semver "^5.6.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.12, npm-packlist@^1.1.6:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f"
+npm-packlist@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+npm-pick-manifest@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
+  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
   dependencies:
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-profile@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa"
-  dependencies:
-    aproba "^1.1.2 || 2"
-    figgy-pudding "^3.4.1"
-    npm-registry-fetch "^3.8.0"
-
-npm-registry-fetch@^3.8.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz#44d841780e2833f06accb34488f8c7450d1a6856"
-  dependencies:
-    JSONStream "^1.3.4"
-    bluebird "^3.5.1"
-    figgy-pudding "^3.4.1"
-    lru-cache "^4.1.3"
-    make-fetch-happen "^4.0.1"
-    npm-package-arg "^6.1.0"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2, npmlog@^4.1.2:
+npmlog@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -4134,284 +5051,324 @@ npm-run-path@^2.0.0:
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
 oauth-sign@~0.8.1:
   version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-copy@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  resolved "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+object-inspect@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
   dependencies:
     define-properties "^1.1.2"
-    es-abstract "^1.5.1"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
+object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
+octokit-pagination-methods@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
+  integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
+
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  resolved "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
 optimist@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  resolved "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
 optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  version "0.8.3"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
+    fast-levenshtein "~2.0.6"
     levn "~0.3.0"
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
-    wordwrap "~1.0.0"
+    word-wrap "~1.2.3"
 
 os-homedir@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@^3.0.0:
+os-name@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  resolved "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
   dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
+    macos-release "^2.2.0"
+    windows-release "^3.1.0"
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4, osenv@^0.1.5:
+osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-
 p-each-series@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  resolved "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
   dependencies:
     p-reduce "^1.0.0"
 
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-
-p-is-promise@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
+  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-limit@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
+  version "2.2.2"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
+  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
 p-map-series@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
+  resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
+  integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=
   dependencies:
     p-reduce "^1.0.0"
 
-p-map@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+p-map@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
 p-pipe@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
+  resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
+  integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
+
+p-queue@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346"
+  integrity sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==
+  dependencies:
+    eventemitter3 "^3.1.0"
 
 p-reduce@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+  resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
 p-try@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 p-waterfall@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00"
+  resolved "https://registry.npmjs.org/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00"
+  integrity sha1-ftlLPOszMngjU69qrhGqn8I1uwA=
   dependencies:
     p-reduce "^1.0.0"
 
-pacote@^9.2.3:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.1.tgz#f0af2a52d241bce523d39280ac810c671db62279"
-  dependencies:
-    bluebird "^3.5.3"
-    cacache "^11.3.2"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.1.0"
-    glob "^7.1.3"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^4.0.1"
-    minimatch "^3.0.4"
-    minipass "^2.3.5"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    normalize-package-data "^2.4.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.12"
-    npm-pick-manifest "^2.2.3"
-    npm-registry-fetch "^3.8.0"
-    osenv "^0.1.5"
-    promise-inflight "^1.0.1"
-    promise-retry "^1.1.1"
-    protoduck "^5.0.1"
-    rimraf "^2.6.2"
-    safe-buffer "^5.1.2"
-    semver "^5.6.0"
-    ssri "^6.0.1"
-    tar "^4.4.8"
-    unique-filename "^1.1.1"
-    which "^1.3.1"
-
 parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
   dependencies:
-    cyclist "~0.2.2"
+    cyclist "^1.0.1"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+  resolved "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"
+  integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA==
+  dependencies:
+    is-ssh "^1.3.0"
+    protocols "^1.4.0"
+
+parse-url@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
+  integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg==
+  dependencies:
+    is-ssh "^1.3.0"
+    normalize-url "^3.3.0"
+    parse-path "^4.0.0"
+    protocols "^1.4.0"
+
 parse5@4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  resolved "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 pascalcase@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-dirname@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -4419,162 +5376,193 @@ path-type@^1.0.0:
 
 path-type@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 performance-now@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+  resolved "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+  integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
 
 performance-now@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.0.tgz#850b18781b4ac6ec58a43c9ed9ec5fe6796addbd"
+pirates@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
   dependencies:
     node-modules-regexp "^1.0.0"
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
     find-up "^3.0.0"
 
 pn@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  resolved "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  resolved "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 prelude-ls@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prettier@^1.3.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
+prettier@1.19.1:
+  version "1.19.1"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-format@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0.tgz#cb6599fd73ac088e37ed682f61291e4678f48591"
+pretty-format@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
+  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
   dependencies:
+    "@jest/types" "^24.9.0"
     ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
+    react-is "^16.8.4"
 
 process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 promise-inflight@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
   dependencies:
     err-code "^1.0.0"
     retry "^0.10.0"
 
 promise@^6.0.0, promise@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
+  resolved "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
+  integrity sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY=
   dependencies:
     asap "~1.0.0"
 
 promise@^7.0.1, promise@^7.1.1:
   version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
 promise@~7.0.1:
   version "7.0.4"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  resolved "https://registry.npmjs.org/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
   dependencies:
     asap "~2.0.3"
 
 prompts@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.1.tgz#201b3718b4276fb407f037db48c0029d6465245c"
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05"
+  integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==
   dependencies:
-    kleur "^3.0.0"
-    sisteransi "^1.0.0"
+    kleur "^3.0.3"
+    sisteransi "^1.0.4"
 
 promzard@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=
   dependencies:
     read "1"
 
 proto-list@~1.2.1:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
+protocols@^1.1.0, protocols@^1.4.0:
+  version "1.4.7"
+  resolved "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32"
+  integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==
 
 protoduck@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  resolved "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
   dependencies:
     genfun "^5.0.0"
 
 prr@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-psl@^1.1.24, psl@^1.1.28:
-  version "1.1.31"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+psl@^1.1.28:
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
+  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
 
 pump@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
 pump@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
 pumpify@^1.3.3:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
@@ -4582,88 +5570,95 @@ pumpify@^1.3.3:
 
 punycode@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@^1.5.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qs@~6.4.0:
   version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
 
 qs@~6.5.2:
   version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 quick-lru@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
+react-is@^16.8.4:
+  version "16.13.0"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
+  integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
 
 read-cmd-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
+  integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==
   dependencies:
     graceful-fs "^4.1.2"
 
 "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1"
+  integrity sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
     normalize-package-data "^2.0.0"
-    slash "^1.0.0"
+    npm-normalize-package-bin "^1.0.0"
   optionalDependencies:
     graceful-fs "^4.1.2"
 
 read-package-tree@^5.1.6:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63"
+  version "5.3.1"
+  resolved "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
+  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
   dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    once "^1.3.0"
     read-package-json "^2.0.0"
     readdir-scoped-modules "^1.0.0"
+    util-promisify "^2.1.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
 read-pkg-up@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
 read-pkg-up@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
   dependencies:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -4671,7 +5666,8 @@ read-pkg@^1.0.0:
 
 read-pkg@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -4679,13 +5675,15 @@ read-pkg@^3.0.0:
 
 read@1, read@~1.0.1:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.4:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -4695,93 +5693,103 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+"readable-stream@2 || 3", readable-stream@^3.0.2:
+  version "3.6.0"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
 readdir-scoped-modules@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
     graceful-fs "^4.1.2"
     once "^1.3.0"
 
-realpath-native@^1.0.0, realpath-native@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
+realpath-native@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
   dependencies:
     util.promisify "^1.0.0"
 
 redent@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  resolved "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
 redent@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  resolved "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  resolved "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
-request-promise-core@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
-    lodash "^4.13.1"
+    lodash "^4.17.15"
 
 request-promise-native@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+  version "1.0.8"
+  resolved "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
-    request-promise-core "1.1.1"
-    stealthy-require "^1.1.0"
-    tough-cookie ">=2.3.3"
+    request-promise-core "1.1.3"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
 
 request@2.81.0:
   version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  resolved "https://registry.npmjs.org/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  integrity sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -4806,9 +5814,10 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.85.0, request@^2.87.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+request@^2.87.0, request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -4817,7 +5826,7 @@ request@^2.85.0, request@^2.87.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -4827,224 +5836,246 @@ request@^2.85.0, request@^2.87.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-from@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-url@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7, resolve@~1.1.6:
   version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
-resolve@^1.1.6:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
-  dependencies:
-    path-parse "^1.0.5"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.3.2:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+resolve@^1.10.0, resolve@^1.15.1, resolve@^1.3.2:
+  version "1.15.1"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
+  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
 ret@~0.1.10:
   version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  resolved "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 right-align@^0.1.1:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  resolved "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
-    glob "^7.0.5"
+    glob "^7.1.3"
 
-rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
-rsvp@^3.3.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
+  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
   dependencies:
     is-promise "^2.1.0"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  resolved "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
 rxjs@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  version "6.5.4"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
+  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
 
-safe-buffer@^5.1.2:
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-3.1.0.tgz#995193b7dc1445ef1fe41ddfca2faf9f111854c6"
+sane@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
   dependencies:
+    "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
-    capture-exit "^1.2.0"
-    exec-sh "^0.2.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
     execa "^1.0.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.18.0"
-  optionalDependencies:
-    fsevents "^1.2.3"
 
 sax@0.5.x:
   version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  resolved "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
 
 sax@^1.2.4:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-
-"semver@2.x || 3.x || 4 || 5", semver@^5.5.1, semver@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+  version "5.7.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+semver@^6.0.0, semver@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
 
-set-value@^2.0.0:
+shallow-clone@2.0.0, shallow-clone@^3.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-2.0.0.tgz#5d0f491e313686b2f53660b8859ca33684f18d20"
+  integrity sha512-M0ikAzIEgiQqFG8gkkuM+sOiVVNSza7VjcvP+WfB8HvYccIFDKt0YIwlx0bbLsD4eiya8ARd0rznCbES9fXMqA==
   dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+    is-extendable "^1.0.1"
+    kind-of "^6.0.0"
+    mixin-object "^3.0.0"
 
 shebang-command@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shellwords@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  resolved "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-
-sisteransi@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
+  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+sisteransi@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
+  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
 
 slash@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  resolved "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
 slide@^1.1.6:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  resolved "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
-smart-buffer@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -5052,13 +6083,15 @@ snapdragon-node@^2.0.1:
 
 snapdragon-util@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  resolved "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  resolved "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -5071,261 +6104,312 @@ snapdragon@^0.8.1:
 
 sntp@1.x.x:
   version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  resolved "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
 socks-proxy-agent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
   dependencies:
-    agent-base "~4.2.0"
-    socks "~2.2.0"
+    agent-base "~4.2.1"
+    socks "~2.3.2"
 
-socks@~2.2.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.3.tgz#7399ce11e19b2a997153c983a9ccb6306721f2dc"
+socks@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
+  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
   dependencies:
-    ip "^1.1.5"
-    smart-buffer "4.0.2"
+    ip "1.1.5"
+    smart-buffer "^4.1.0"
 
 sort-keys@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  version "0.5.3"
+  resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
 source-map-support@^0.5.6:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
+  version "0.5.16"
+  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@0.1.x:
   version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
   version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 spdx-correct@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+  version "3.0.5"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
+  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  resolved "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
   dependencies:
     through2 "^2.0.2"
 
 split@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
+  version "1.16.1"
+  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  resolved "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 stack-utils@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
 
 static-extend@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-stealthy-require@^1.1.0:
+stealthy-require@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-each@^1.1.0:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  resolved "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
 
 stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 string-length@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  resolved "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
   dependencies:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
-    safe-buffer "~5.1.0"
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string.prototype.trimleft@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
+  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+string.prototype.trimright@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
+  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-package@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
-
 stringstream@~0.0.4:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+  resolved "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
   integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
-
-strip-bom@3.0.0, strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
 strip-eof@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-indent@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
 strong-log-transformer@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
+  resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
+  integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
   dependencies:
     duplexer "^0.1.1"
     minimist "^1.2.0"
     through "^2.3.4"
 
-stylus@~0.54.5:
+stylus@0.54.5, stylus@~0.54.5:
   version "0.54.5"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  resolved "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
   dependencies:
     css-parse "1.7.x"
     debug "*"
@@ -5335,56 +6419,55 @@ stylus@~0.54.5:
     source-map "0.1.x"
 
 supports-color@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  version "5.5.0"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.0.0, supports-color@^6.1.0:
+supports-color@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
   dependencies:
     has-flag "^3.0.0"
 
 symbol-tree@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  version "3.2.4"
+  resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tar@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-1.0.3.tgz#15bcdab244fa4add44e4244a0176edb8aa9a2b44"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  resolved "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz#15bcdab244fa4add44e4244a0176edb8aa9a2b44"
+  integrity sha1-FbzaskT6St1E5CRKAXbtuKqaK0Q=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4, tar@^4.4.8:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
+  version "4.4.13"
+  resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
-    yallist "^3.0.2"
+    yallist "^3.0.3"
 
 temp-dir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
+  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
 
 temp-write@^3.4.0:
   version "3.4.0"
-  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
+  resolved "https://registry.npmjs.org/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
+  integrity sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI=
   dependencies:
     graceful-fs "^4.1.2"
     is-stream "^1.1.0"
@@ -5393,160 +6476,192 @@ temp-write@^3.4.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-test-exclude@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.1.0.tgz#6ba6b25179d2d38724824661323b73e03c0c1de1"
+test-exclude@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
   dependencies:
-    arrify "^1.0.1"
+    glob "^7.1.3"
     minimatch "^3.0.4"
     read-pkg-up "^4.0.0"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
 
 text-extensions@^1.0.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
+  version "1.9.0"
+  resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
+  integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
+  integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
+  dependencies:
+    any-promise "^1.0.0"
 
 throat@^4.0.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
 through2@^2.0.0, through2@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
-    readable-stream "^2.1.5"
+    readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
   version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 tmp@^0.0.33:
   version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 tmpl@1.0.x:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-token-stream@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
-
-tough-cookie@>=2.3.3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
-  dependencies:
-    ip-regex "^2.1.0"
-    psl "^1.1.28"
-    punycode "^2.1.1"
+token-stream@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
+  integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=
 
-tough-cookie@^2.3.4:
+tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0:
   version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
     psl "^1.1.28"
     punycode "^2.1.1"
 
 tough-cookie@~2.3.0:
   version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 tr46@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
   dependencies:
     punycode "^2.1.0"
 
 trim-newlines@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  resolved "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
 tslib@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  version "1.11.1"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-uc.micro@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
+uc.micro@^1.0.1, uc.micro@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
-uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.10:
+uglify-js@^2.6.1, uglify-js@^2.8.10:
   version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -5554,10 +6669,11 @@ uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.10:
     uglify-to-browserify "~1.0.0"
 
 uglify-js@^3.1.4:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  version "3.8.0"
+  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805"
+  integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.20.3"
     source-map "~0.6.1"
 
 "uglify-js@github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7":
@@ -5571,169 +6687,199 @@ uglify-js@^3.1.4:
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  resolved "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
 uid-number@0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+  resolved "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+  integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=
 
 umask@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+  resolved "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+  integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 unique-filename@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
+universal-user-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz#fd8d6cb773a679a709e967ef8288a31fcc03e557"
+  integrity sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==
+  dependencies:
+    os-name "^3.1.0"
+
+universal-user-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz#a3182aa758069bf0e79952570ca757de3579c1d9"
+  integrity sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==
+  dependencies:
+    os-name "^3.1.0"
+
 universalify@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+  version "0.1.2"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unset-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+upath@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
 uri-js@^4.2.2:
   version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 use@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+util-promisify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
+  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
   dependencies:
-    define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
-uuid@^3.0.0, uuid@^3.0.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-
-uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
+util.promisify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
   dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
+
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-validate-npm-package-license@^3.0.3:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
 verror@1.10.0:
   version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-void-elements@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+void-elements@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
 
 w3c-hr-time@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
-    browser-process-hrtime "^0.1.2"
+    browser-process-hrtime "^1.0.0"
 
-walker@~1.0.5:
+walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  resolved "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
   dependencies:
     makeerror "1.0.x"
 
-watch@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
-
 wcwidth@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
   dependencies:
     defaults "^1.0.3"
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-whatwg-encoding@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
-  dependencies:
-    iconv-lite "0.4.19"
-
-whatwg-encoding@^1.0.3:
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
   dependencies:
     iconv-lite "0.4.24"
 
 whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
 whatwg-url@^6.4.1:
   version "6.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
 whatwg-url@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  version "7.1.0"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -5741,79 +6887,96 @@ whatwg-url@^7.0.0:
 
 which-module@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.12, which@^1.3.0, which@^1.3.1:
+which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  dependencies:
-    isexe "^2.0.0"
-
-which@^1.2.9:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
-    string-width "^1.0.2"
+    string-width "^1.0.2 || 2"
 
 window-size@0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  resolved "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
-with@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+windows-release@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
   dependencies:
-    acorn "^3.1.0"
-    acorn-globals "^3.0.0"
+    execa "^1.0.0"
+
+with@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/with/-/with-6.0.0.tgz#00223660fa0d0aeb4776965e61f902410c4c9d86"
+  integrity sha512-FrwIIWGUkHViaUXWmEvcwKy+eI0ajKh/Xq192o2kwFtSI7lS7xE5O1E2VNurhWE9ZLRDwr6GAAkKDsDIyStUuw==
+  dependencies:
+    babel-runtime "^6.11.6"
+    babel-types "^6.15.0"
+    babylon "^6.9.1"
+    babylon-walk "^1.0.2"
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
 wordwrap@0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
 wordwrap@~0.0.2:
   version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
   dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+write-file-atomic@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
+  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
+write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2:
+  version "2.4.3"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-json-file@^2.2.0, write-json-file@^2.3.0:
+write-json-file@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
+  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
+  integrity sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=
   dependencies:
     detect-indent "^5.0.0"
     graceful-fs "^4.1.2"
@@ -5822,66 +6985,113 @@ write-json-file@^2.2.0, write-json-file@^2.3.0:
     sort-keys "^2.0.0"
     write-file-atomic "^2.0.0"
 
+write-json-file@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
+  integrity sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==
+  dependencies:
+    detect-indent "^5.0.0"
+    graceful-fs "^4.1.15"
+    make-dir "^2.1.0"
+    pify "^4.0.1"
+    sort-keys "^2.0.0"
+    write-file-atomic "^2.4.2"
+
 write-pkg@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9"
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz#0e178fe97820d389a8928bc79535dbe68c2cff21"
+  integrity sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==
   dependencies:
     sort-keys "^2.0.0"
     write-json-file "^2.2.0"
 
 ws@^5.2.0:
   version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  resolved "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
   dependencies:
     async-limiter "~1.0.0"
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+y18n@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+yargs-parser@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
 
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+yargs-parser@^15.0.1:
+  version "15.0.1"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
+  integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^12.0.1, yargs@^12.0.2:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+yargs@^13.3.0:
+  version "13.3.2"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
   dependencies:
-    cliui "^4.0.0"
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+yargs@^14.2.2:
+  version "14.2.3"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414"
+  integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==
+  dependencies:
+    cliui "^5.0.0"
     decamelize "^1.2.0"
     find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
+    get-caller-file "^2.0.1"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
+    y18n "^4.0.0"
+    yargs-parser "^15.0.1"
 
 yargs@~3.10.0:
   version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
   dependencies:
     camelcase "^1.0.2"
     cliui "^2.1.0"

From 7e0a8e4c44dad0d60f8622b1db018e883dc9a28e Mon Sep 17 00:00:00 2001
From: Birzhan Utegenov <coovenbm@gmail.com>
Date: Fri, 1 May 2020 23:03:55 +0700
Subject: [PATCH 79/96] Add the possibility of replacing generateCode function
 (#3230)

---
 packages/pug/lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pug/lib/index.js b/packages/pug/lib/index.js
index e76487d2c..2d9b16c9c 100644
--- a/packages/pug/lib/index.js
+++ b/packages/pug/lib/index.js
@@ -172,7 +172,7 @@ function compileBody(str, options){
 
   // Compile
   ast = applyPlugins(ast, options, plugins, 'preCodeGen');
-  var js = generateCode(ast, {
+  var js = (findReplacementFunc(plugins, 'generateCode') || generateCode)(ast, {
     pretty: options.pretty,
     compileDebug: options.compileDebug,
     doctype: options.doctype,

From c99cb3c8e3012895e4f66fd6636e246454822012 Mon Sep 17 00:00:00 2001
From: Shinigami <chrissi92@hotmail.de>
Date: Fri, 1 May 2020 18:09:20 +0200
Subject: [PATCH 80/96] TypeScript definitions for pug-tokens (#3196)

---
 packages/pug-lexer/index.d.ts | 338 ++++++++++++++++++++++++++++++++++
 1 file changed, 338 insertions(+)
 create mode 100644 packages/pug-lexer/index.d.ts

diff --git a/packages/pug-lexer/index.d.ts b/packages/pug-lexer/index.d.ts
new file mode 100644
index 000000000..a5c3addf4
--- /dev/null
+++ b/packages/pug-lexer/index.d.ts
@@ -0,0 +1,338 @@
+declare module 'pug-lexer' {
+	namespace lex {
+		export interface Loc {
+			start: { line: number; column: number };
+			end: { line: number; column: number };
+		}
+
+		export type LexTokenType =
+			| ':'
+			| '&attributes'
+			| 'attribute'
+			| 'block'
+			| 'blockcode'
+			| 'call'
+			| 'case'
+			| 'class'
+			| 'code'
+			| 'comment'
+			| 'default'
+			| 'doctype'
+			| 'dot'
+			| 'each'
+			| 'else-if'
+			| 'else'
+			| 'end-attributes'
+			| 'end-pipeless-text'
+			| 'end-pug-interpolation'
+			| 'eos'
+			| 'extends'
+			| 'filter'
+			| 'id'
+			| 'if'
+			| 'include'
+			| 'indent'
+			| 'interpolated-code'
+			| 'interpolation'
+			| 'mixin-block'
+			| 'mixin'
+			| 'newline'
+			| 'outdent'
+			| 'path'
+			| 'slash'
+			| 'start-attributes'
+			| 'start-pipeless-text'
+			| 'start-pug-interpolation'
+			| 'tag'
+			| 'text-html'
+			| 'text'
+			| 'when'
+			| 'while'
+			| 'yield';
+
+		export interface LexToken<Type extends LexTokenType> {
+			type: Type;
+			loc: Loc;
+		}
+
+		export interface TagToken extends LexToken<'tag'> {
+			val: string;
+		}
+
+		export type StartAttributesToken = LexToken<'start-attributes'>;
+
+		export interface AttributeToken extends LexToken<'attribute'> {
+			name: string;
+			val: string | boolean;
+			mustEscape: boolean;
+		}
+
+		export type EndAttributesToken = LexToken<'end-attributes'>;
+
+		export interface IndentToken extends LexToken<'indent'> {
+			val: number;
+		}
+
+		export interface ClassToken extends LexToken<'class'> {
+			val: string;
+		}
+
+		export type OutdentToken = LexToken<'outdent'>;
+
+		export type EosToken = LexToken<'eos'>;
+
+		export interface CommentToken extends LexToken<'comment'> {
+			val: string;
+			buffer: boolean;
+		}
+
+		export type NewlineToken = LexToken<'newline'>;
+
+		export interface TextToken extends LexToken<'text'> {
+			val: string;
+		}
+
+		export interface InterpolatedCodeToken extends LexToken<'interpolated-code'> {
+			mustEscape: boolean;
+			buffer: boolean;
+			val: string;
+		}
+
+		export interface CodeToken extends LexToken<'code'> {
+			val: string;
+			mustEscape: boolean;
+			buffer: boolean;
+		}
+
+		export interface IdToken extends LexToken<'id'> {
+			val: string;
+		}
+
+		export type StartPipelessTextToken = LexToken<'start-pipeless-text'>;
+
+		export type EndPipelessTextToken = LexToken<'end-pipeless-text'>;
+
+		export interface DoctypeToken extends LexToken<'doctype'> {
+			val: string;
+		}
+
+		export type DotToken = LexToken<'dot'>;
+
+		export interface BlockToken extends LexToken<'block'> {
+			val: string;
+			mode: 'replace' | 'prepend' | 'append';
+		}
+
+		export type ExtendsToken = LexToken<'extends'>;
+
+		export interface PathToken extends LexToken<'path'> {
+			val: string;
+		}
+
+		export type StartPugInterpolationToken = LexToken<'start-pug-interpolation'>;
+
+		export type EndPugInterpolationToken = LexToken<'end-pug-interpolation'>;
+
+		export interface InterpolationToken extends LexToken<'interpolation'> {
+			val: string;
+		}
+
+		export type IncludeToken = LexToken<'include'>;
+
+		export interface FilterToken extends LexToken<'filter'> {
+			val: string;
+		}
+
+		export interface CallToken extends LexToken<'call'> {
+			val: string;
+			args: string;
+		}
+
+		export interface MixinToken extends LexToken<'mixin'> {
+			val: string;
+			args: string | null;
+		}
+
+		export interface IfToken extends LexToken<'if'> {
+			val: string;
+		}
+
+		export type MixinBlockToken = LexToken<'mixin-block'>;
+
+		export interface ElseToken extends LexToken<'else'> {
+			val: string;
+		}
+
+		export interface AndAttributesToken extends LexToken<'&attributes'> {
+			val: string;
+		}
+
+		export interface TextHtmlToken extends LexToken<'text-html'> {
+			val: string;
+		}
+
+		export interface EachToken extends LexToken<'each'> {
+			val: string;
+			key: string | null;
+			code: string;
+		}
+
+		export interface WhileToken extends LexToken<'while'> {
+			val: string;
+		}
+
+		export interface CaseToken extends LexToken<'case'> {
+			val: string;
+		}
+
+		export interface WhenToken extends LexToken<'when'> {
+			val: string;
+		}
+
+		export type ColonToken = LexToken<':'>;
+
+		export type DefaultToken = LexToken<'default'>;
+
+		export interface ElseIfToken extends LexToken<'else-if'> {
+			val: string;
+		}
+
+		export type BlockcodeToken = LexToken<'blockcode'>;
+
+		export type YieldToken = LexToken<'yield'>;
+
+		export type SlashToken = LexToken<'slash'>;
+
+		export type Token =
+			| AndAttributesToken
+			| AttributeToken
+			| BlockcodeToken
+			| BlockToken
+			| CallToken
+			| CaseToken
+			| ClassToken
+			| CodeToken
+			| ColonToken
+			| CommentToken
+			| DefaultToken
+			| DoctypeToken
+			| DotToken
+			| EachToken
+			| ElseIfToken
+			| ElseToken
+			| EndAttributesToken
+			| EndPipelessTextToken
+			| EndPugInterpolationToken
+			| EosToken
+			| ExtendsToken
+			| FilterToken
+			| IdToken
+			| IfToken
+			| IncludeToken
+			| IndentToken
+			| InterpolatedCodeToken
+			| InterpolationToken
+			| MixinBlockToken
+			| MixinToken
+			| NewlineToken
+			| OutdentToken
+			| PathToken
+			| SlashToken
+			| StartAttributesToken
+			| StartPipelessTextToken
+			| StartPugInterpolationToken
+			| TagToken
+			| TextHtmlToken
+			| TextToken
+			| WhenToken
+			| WhileToken
+			| YieldToken;
+
+		export type LexerFunction = (type: string, exp?: any) => boolean;
+		export interface LexerOptions {
+			filename: string;
+			interpolated?: boolean;
+			startingLine?: number;
+			startingColumn?: number;
+			plugins?: LexerFunction[];
+		}
+		export class Lexer {
+			input: string;
+			originalInput: string;
+			filename?: string;
+			interpolated: boolean;
+			lineno: number;
+			colno: number;
+			plugins: LexerFunction[];
+			indentStack: number[];
+			indentRe: RegExp | null;
+			interpolationAllowed: boolean;
+			whitespaceRe: RegExp;
+			tokens: Token[];
+			ended: boolean;
+			constructor(str: string, options?: LexerOptions);
+			error(code: string, message: string): never;
+			assert(value: any, message: string): void;
+			isExpression(exp: string): boolean;
+			assertExpression(exp: string, noThrow?: boolean): boolean;
+			assertNestingCorrect(exp: string): void;
+			private tok<Type extends LexTokenType>(type: Type, val?: any): LexToken<Type>;
+			private tokEnd<Type extends LexTokenType>(tok: LexToken<Type>): LexToken<Type>;
+			private incrementLine(increment: number): void;
+			private incrementColumn(increment: number): void;
+			private consume(len: number): void;
+			private scan<Type extends LexTokenType>(regexp: RegExp, type: Type): LexToken<Type> | undefined;
+			private scanEndOfLine<Type extends LexTokenType>(regexp: RegExp, type: Type): LexToken<Type> | undefined;
+			private bracketExpression(skip?: number): number;
+			scanIndentation(): RegExpExecArray | null;
+			eos(): true | undefined;
+			blank(): true | undefined;
+			comment(): true | undefined;
+			interpolation(): true | undefined;
+			tag(): true | undefined;
+			filter(): true | undefined;
+			doctype(): true | undefined;
+			id(): true | undefined;
+			className(): true | undefined;
+			endInterpolation(): true | undefined;
+			addText(type: LexTokenType, value: string, prefix?: string, escaped?: number): void;
+			text(): true | undefined;
+			textHtml(): true | undefined;
+			dot(): true | undefined;
+			extends(): true | undefined;
+			prepend(): true | undefined;
+			append(): true | undefined;
+			block(): true | undefined;
+			mixinBlock(): true | undefined;
+			yield(): true | undefined;
+			include(): true | undefined;
+			path(): true | undefined;
+			case(): true | undefined;
+			when(): true | undefined;
+			default(): true | undefined;
+			call(): true | undefined;
+			mixin(): true | undefined;
+			conditional(): true | undefined;
+			while(): true | undefined;
+			each(): true | undefined;
+			eachOf(): true | undefined;
+			code(): true | undefined;
+			blockCode(): true | undefined;
+			attribute(): string;
+			attributeValue(str: string): { val?: string; mustEscape?: boolean; remainingSource: string };
+			attrs(): true | undefined;
+			attributesBlock(): true | undefined;
+			indent(): true | NewlineToken | undefined;
+			pipelessText(indents?: number): boolean | undefined;
+			slash(): true | undefined;
+			colon(): true | undefined;
+			fail(): never;
+			callLexerFunction(func: string): boolean;
+			private advance(): boolean;
+			getTokens(): Token[];
+		}
+	}
+	function lex(str: string, options?: lex.LexerOptions): lex.Token[];
+	export = lex;
+}
+  

From b043d7c0780bb7a242cca1540865d7b6c0bca701 Mon Sep 17 00:00:00 2001
From: Chris Harvey <chharvey@users.noreply.github.com>
Date: Fri, 1 May 2020 12:13:53 -0400
Subject: [PATCH 81/96] wrap setting err.message with a try/catch (#2996)

---
 packages/pug-runtime/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/pug-runtime/index.js b/packages/pug-runtime/index.js
index a156db358..4bd21803d 100644
--- a/packages/pug-runtime/index.js
+++ b/packages/pug-runtime/index.js
@@ -248,7 +248,9 @@ function pug_rethrow(err, filename, lineno, str){
 
   // Alter exception message
   err.path = filename;
-  err.message = (filename || 'Pug') + ':' + lineno
-    + '\n' + context + '\n\n' + err.message;
+  try {
+    err.message = (filename || 'Pug') + ':' + lineno
+      + '\n' + context + '\n\n' + err.message;
+  } catch (e) {}
   throw err;
 };

From f97ebdb48c7c0fdd4ff4b7418dcf4e03b27a1405 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Fri, 1 May 2020 22:00:44 +0100
Subject: [PATCH 82/96] chore: remove lerna as yarn supports enough stuff now
 (#3243)

---
 .github/workflows/rollingversions.yml         |   33 +
 .github/workflows/test.yml                    |   27 +
 .travis.yml                                   |   21 -
 .yarnrc                                       |    1 -
 lerna.json                                    |    8 -
 package.json                                  |   20 +-
 packages/pug-attrs/index.js                   |   60 +-
 packages/pug-attrs/test/index.test.js         |  357 +-
 packages/pug-code-gen/index.js                |  420 ++-
 packages/pug-error/index.js                   |   32 +-
 packages/pug-error/test/index.test.js         |   71 +-
 packages/pug-filters/index.js                 |    2 +-
 packages/pug-filters/lib/handle-filters.js    |  134 +-
 packages/pug-filters/lib/run-filter.js        |    4 +-
 packages/pug-filters/test/custom-filters.js   |    4 +-
 .../pug-filters/test/filter-aliases.test.js   |   33 +-
 packages/pug-filters/test/index.test.js       |   28 +-
 ...-options-applied-to-nested-filters.test.js |    8 +-
 .../pug-filters/test/update-test-cases.js     |  233 +-
 packages/pug-lexer/index.js                   |  609 ++--
 .../test/cases/javascript-new-lines.js        |    2 +-
 .../test/check-lexer-functions.test.js        |   28 +-
 packages/pug-lexer/test/index.test.js         |   15 +-
 packages/pug-linker/index.js                  |  117 +-
 .../test/cases-src/auxiliary/includable.js    |    9 +-
 .../test/cases-src/javascript-new-lines.js    |    2 +-
 packages/pug-linker/test/index.test.js        |   24 +-
 packages/pug-load/index.js                    |   45 +-
 packages/pug-load/test/index.test.js          |   16 +-
 packages/pug-parser/index.js                  |  495 ++-
 packages/pug-parser/lib/inline-tags.js        |   40 +-
 packages/pug-parser/test/index.test.js        |   13 +-
 .../test/no-unnecessary-blocks.test.js        |    2 +-
 packages/pug-runtime/build.js                 |   11 +-
 packages/pug-runtime/index.js                 |   94 +-
 packages/pug-runtime/package.json             |    3 +-
 packages/pug-runtime/prepublish.js            |   44 +-
 packages/pug-runtime/test/index.test.js       |  150 +-
 packages/pug-runtime/wrap.js                  |    6 +-
 packages/pug-strip-comments/index.js          |   29 +-
 .../pug-strip-comments/test/index.test.js     |   16 +-
 packages/pug-walk/index.js                    |   15 +-
 packages/pug-walk/test/index.test.js          |  205 +-
 packages/pug/examples/attributes.js           |   11 +-
 packages/pug/examples/code.js                 |   15 +-
 packages/pug/examples/dynamicscript.js        |    7 +-
 packages/pug/examples/each.js                 |   15 +-
 packages/pug/examples/extend.js               |   25 +-
 packages/pug/examples/form.js                 |   13 +-
 packages/pug/examples/includes.js             |   11 +-
 packages/pug/examples/layout-debug.js         |    7 +-
 packages/pug/examples/layout.js               |   11 +-
 packages/pug/examples/mixins.js               |   15 +-
 packages/pug/examples/rss.js                  |   29 +-
 packages/pug/examples/text.js                 |   11 +-
 packages/pug/examples/whitespace.js           |   11 +-
 packages/pug/lib/index.js                     |  133 +-
 packages/pug/register.js                      |   17 +-
 packages/pug/support/benchmark.js             |   54 +-
 .../pug/test/__snapshots__/pug.test.js.snap   |   32 +-
 .../pug/test/cases/auxiliary/includable.js    |    9 +-
 .../pug/test/cases/includes-with-ext-js.html  |    2 +-
 packages/pug/test/cases/includes.html         |    8 +-
 .../pug/test/cases/javascript-new-lines.js    |    2 +-
 .../pug/test/duplicate-block/index.test.js    |   12 +-
 packages/pug/test/eachOf/index.test.js        |   72 +-
 packages/pug/test/error.reporting.test.js     |  207 +-
 packages/pug/test/examples.test.js            |   10 +-
 .../test/extends-not-top-level/index.test.js  |   16 +-
 packages/pug/test/markdown-it/index.test.js   |   14 +-
 packages/pug/test/pug.test.js                 | 1636 +++++----
 .../pug/test/regression-2436/index.test.js    |   14 +-
 packages/pug/test/run-es2015.test.js          |    2 +-
 packages/pug/test/run-syntax-errors.test.js   |   25 +-
 packages/pug/test/run-utils.js                |  132 +-
 packages/pug/test/run.test.js                 |    2 +-
 .../pug/test/shadowed-block/index.test.js     |   12 +-
 scripts/filename-serializer.js                |   11 +-
 scripts/prettier-javascript-serializer.js     |    2 +-
 yarn.lock                                     | 3248 +----------------
 80 files changed, 3956 insertions(+), 5383 deletions(-)
 create mode 100644 .github/workflows/rollingversions.yml
 create mode 100644 .github/workflows/test.yml
 delete mode 100644 .travis.yml
 delete mode 100644 .yarnrc
 delete mode 100644 lerna.json

diff --git a/.github/workflows/rollingversions.yml b/.github/workflows/rollingversions.yml
new file mode 100644
index 000000000..fe688f79d
--- /dev/null
+++ b/.github/workflows/rollingversions.yml
@@ -0,0 +1,33 @@
+name: Release
+on:
+  repository_dispatch:
+    types: [rollingversions_publish_approved]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn install --forzen-lockfile
+      - run: yarn prettier:check
+      - run: yarn test
+
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - run: yarn install --forzen-lockfile
+      - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+      - run: npx rollingversions publish
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..0dcf9c96a
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,27 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn install --forzen-lockfile
+      - run: yarn prettier:check
+      - run: yarn test
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3c2bbf83d..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: node_js
-node_js:
-  - "6"
-  - "8"
-  - "10"
-  - "12"
-
-# Use faster Docker architecture on Travis.
-sudo: false
-
-script: yarn test
-# TODO: coverage
-# after_success: npm run coveralls
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/dd893be75c6b9908987d
-    on_success: change
-    on_failure: always
-    on_start:   never
diff --git a/.yarnrc b/.yarnrc
deleted file mode 100644
index 24efd034b..000000000
--- a/.yarnrc
+++ /dev/null
@@ -1 +0,0 @@
-workspaces-experimental true
\ No newline at end of file
diff --git a/lerna.json b/lerna.json
deleted file mode 100644
index 3059f1f32..000000000
--- a/lerna.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "lerna": "3.10.8",
-  "packages": ["packages/*"],
-  "npmClient": "yarn",
-  "useWorkspaces": true,
-  "version": "independent",
-  "registry": "https://registry.npmjs.org/"
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index 6172c2cc0..1087ae2d9 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,12 @@
 {
   "name": "pug-monorepo",
   "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
   "devDependencies": {
     "coveralls": "3.0.9",
     "jest": "24.9.0",
-    "lerna": "3.20.2",
     "prettier": "1.19.1"
   },
   "repository": {
@@ -12,11 +14,9 @@
     "url": "https://github.com/pugjs/pug.git"
   },
   "scripts": {
+    "prettier:check": "prettier --ignore-path .gitignore --list-different './**/*.js'",
     "format": "prettier --ignore-path .gitignore --write './**/*.js'",
-    "bootstrap": "lerna bootstrap",
-    "clean": "lerna clean",
-    "release": "lerna publish",
-    "pretest": "lerna run pretest",
+    "pretest": "wsrun --stages --exclude-missing --fast-exit --collect-logs build",
     "test": "jest",
     "coverage": "jest --coverage",
     "coveralls": "jest --coverage --coverageReporters=text-lcov | coveralls",
@@ -30,13 +30,7 @@
     ]
   },
   "license": "MIT",
-  "workspaces": [
-    "packages/*"
-  ],
-  "resolutions": {
-    "jstransformer-markdown-it": "2.0.0",
-    "mkdirp": "0.5.1",
-    "shallow-clone": "2.0.0",
-    "stylus": "0.54.5"
+  "dependencies": {
+    "wsrun": "^5.2.0"
   }
 }
diff --git a/packages/pug-attrs/index.js b/packages/pug-attrs/index.js
index 50d732144..9850ac390 100644
--- a/packages/pug-attrs/index.js
+++ b/packages/pug-attrs/index.js
@@ -6,10 +6,10 @@ var runtime = require('pug-runtime');
 var stringify = require('js-stringify');
 
 function isConstant(src) {
-  return constantinople(src, {pug: runtime, 'pug_interp': undefined});
+  return constantinople(src, {pug: runtime, pug_interp: undefined});
 }
 function toConstant(src) {
-  return constantinople.toConstant(src, {pug: runtime, 'pug_interp': undefined});
+  return constantinople.toConstant(src, {pug: runtime, pug_interp: undefined});
 }
 
 module.exports = compileAttrs;
@@ -21,15 +21,23 @@ module.exports = compileAttrs;
  */
 function compileAttrs(attrs, options) {
   assert(Array.isArray(attrs), 'Attrs should be an array');
-  assert(attrs.every(function (attr) {
-    return attr &&
-      typeof attr === 'object' &&
-      typeof attr.name === 'string' &&
-      (typeof attr.val === 'string' || typeof attr.val === 'boolean') &&
-      typeof attr.mustEscape === 'boolean';
-  }), 'All attributes should be supplied as an object of the form {name, val, mustEscape}');
+  assert(
+    attrs.every(function(attr) {
+      return (
+        attr &&
+        typeof attr === 'object' &&
+        typeof attr.name === 'string' &&
+        (typeof attr.val === 'string' || typeof attr.val === 'boolean') &&
+        typeof attr.mustEscape === 'boolean'
+      );
+    }),
+    'All attributes should be supplied as an object of the form {name, val, mustEscape}'
+  );
   assert(options && typeof options === 'object', 'Options should be an object');
-  assert(typeof options.terse === 'boolean', 'Options.terse should be a boolean');
+  assert(
+    typeof options.terse === 'boolean',
+    'Options.terse should be a boolean'
+  );
   assert(
     typeof options.runtime === 'function',
     'Options.runtime should be a function that takes a runtime function name and returns the source code that will evaluate to that function at runtime'
@@ -46,7 +54,9 @@ function compileAttrs(attrs, options) {
   function addAttribute(key, val, mustEscape, buf) {
     if (isConstant(val)) {
       if (options.format === 'html') {
-        var str = stringify(runtime.attr(key, toConstant(val), mustEscape, options.terse));
+        var str = stringify(
+          runtime.attr(key, toConstant(val), mustEscape, options.terse)
+        );
         var last = buf[buf.length - 1];
         if (last && last[last.length - 1] === str[0]) {
           buf[buf.length - 1] = last.substr(0, last.length - 1) + str.substr(1);
@@ -62,7 +72,18 @@ function compileAttrs(attrs, options) {
       }
     } else {
       if (options.format === 'html') {
-        buf.push(options.runtime('attr') + '("' + key + '", ' + val + ', ' + stringify(mustEscape) + ', ' + stringify(options.terse) + ')');
+        buf.push(
+          options.runtime('attr') +
+            '("' +
+            key +
+            '", ' +
+            val +
+            ', ' +
+            stringify(mustEscape) +
+            ', ' +
+            stringify(options.terse) +
+            ')'
+        );
       } else {
         if (mustEscape) {
           val = options.runtime('escape') + '(' + val + ')';
@@ -72,7 +93,7 @@ function compileAttrs(attrs, options) {
     }
   }
 
-  attrs.forEach(function(attr){
+  attrs.forEach(function(attr) {
     var key = attr.name;
     var val = attr.val;
     var mustEscape = attr.mustEscape;
@@ -101,16 +122,23 @@ function compileAttrs(attrs, options) {
         classesBuf
       );
     } else {
-      classes = classes.map(function (cls, i) {
+      classes = classes.map(function(cls, i) {
         if (isConstant(cls)) {
-          cls = stringify(classEscaping[i] ? runtime.escape(toConstant(cls)) : toConstant(cls));
+          cls = stringify(
+            classEscaping[i] ? runtime.escape(toConstant(cls)) : toConstant(cls)
+          );
           classEscaping[i] = false;
         }
         return cls;
       });
       addAttribute(
         'class',
-        options.runtime('classes') + '([' + classes.join(',') + '], ' + stringify(classEscaping) + ')',
+        options.runtime('classes') +
+          '([' +
+          classes.join(',') +
+          '], ' +
+          stringify(classEscaping) +
+          ')',
         false,
         classesBuf
       );
diff --git a/packages/pug-attrs/test/index.test.js b/packages/pug-attrs/test/index.test.js
index 1fb0d56d1..7bb8854ae 100644
--- a/packages/pug-attrs/test/index.test.js
+++ b/packages/pug-attrs/test/index.test.js
@@ -9,88 +9,293 @@ function test(input, expected, locals) {
   var opts = options;
   locals = locals || {};
   locals.pug = locals.pug || require('pug-runtime');
-  it(utils.inspect(input).replace(/\n/g, '') + ' => ' + utils.inspect(expected), function () {
-    var src = attrs(input, opts);
-    var localKeys = Object.keys(locals).sort();
-    var output = Function(localKeys.join(', '), 'return (' + src + ');').apply(null, localKeys.map(function (key) { return locals[key]; }));
-    if (opts.format === 'html') {
-      expect(output).toBe(expected);
-    } else {
-      expect(output).toEqual(expected);
+  it(
+    utils.inspect(input).replace(/\n/g, '') + ' => ' + utils.inspect(expected),
+    function() {
+      var src = attrs(input, opts);
+      var localKeys = Object.keys(locals).sort();
+      var output = Function(
+        localKeys.join(', '),
+        'return (' + src + ');'
+      ).apply(
+        null,
+        localKeys.map(function(key) {
+          return locals[key];
+        })
+      );
+      if (opts.format === 'html') {
+        expect(output).toBe(expected);
+      } else {
+        expect(output).toEqual(expected);
+      }
     }
-  });
+  );
 }
 function withOptions(opts, fn) {
-  describe('options: ' + utils.inspect(opts), function () {
+  describe('options: ' + utils.inspect(opts), function() {
     options = opts;
     fn();
   });
 }
 
-withOptions({terse: true, format: 'html', runtime: function (name) { return 'pug.' + name; }}, function () {
-  test([], '');
-  test([{name: 'foo', val: 'false', mustEscape: true}], '');
-  test([{name: 'foo', val: 'true', mustEscape: true}], ' foo');
-  test([{name: 'foo', val: false, mustEscape: true}], '');
-  test([{name: 'foo', val: true, mustEscape: true}], ' foo');
-  test([{name: 'foo', val: 'foo', mustEscape: true}], '', {foo: false});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo', {foo: true});
-  test([{name: 'foo', val: '"foo"', mustEscape: true}], ' foo="foo"');
-  test([{name: 'foo', val: '"foo"', mustEscape: true}, {name: 'bar', val: '"bar"', mustEscape: true}], ' foo="foo" bar="bar"');
-  test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo="fooo"', {foo: 'fooo'});
-  test([{name: 'foo', val: 'foo', mustEscape: true}, {name: 'bar', val: 'bar', mustEscape: true}], ' foo="fooo" bar="baro"', {foo: 'fooo', bar: 'baro'});
-  test([{name: 'style', val: '{color: "red"}', mustEscape: true}], ' style="color:red;"');
-  test([{name: 'style', val: '{color: color}', mustEscape: true}], ' style="color:red;"', {color: 'red'});
-  test([{name: 'class', val: '"foo"', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], ' class="foo bar baz"');
-  test([{name: 'class', val: '{foo: foo}', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], ' class="foo bar baz"', {foo: true});
-  test([{name: 'class', val: '{foo: foo}', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], ' class="bar baz"', {foo: false});
-  test([{name: 'class', val: 'foo', mustEscape: true}, {name: 'class', val: '"<str>"', mustEscape: true}], ' class="&lt;foo&gt; &lt;str&gt;"', {foo: '<foo>'});
-  test([{name: 'foo', val: '"foo"', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], ' class="bar baz" foo="foo"');
-  test([{name: 'class', val: '["bar", "baz"]', mustEscape: true}, {name: 'foo', val: '"foo"', mustEscape: true}], ' class="bar baz" foo="foo"');
-  test([{name: 'foo', val: '"<foo>"', mustEscape: false}], ' foo="<foo>"');
-  test([{name: 'foo', val: '"<foo>"', mustEscape: true}], ' foo="&lt;foo&gt;"');
-  test([{name: 'foo', val: 'foo', mustEscape: false}], ' foo="<foo>"', {foo: '<foo>'});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo="&lt;foo&gt;"', {foo: '<foo>'});
-});
-withOptions({terse: false, format: 'html', runtime: function (name) { return 'pug.' + name; }}, function () {
-  test([{name: 'foo', val: 'false', mustEscape: true}], '');
-  test([{name: 'foo', val: 'true', mustEscape: true}], ' foo="foo"');
-  test([{name: 'foo', val: false, mustEscape: true}], '');
-  test([{name: 'foo', val: true, mustEscape: true}], ' foo="foo"');
-  test([{name: 'foo', val: 'foo', mustEscape: true}], '', {foo: false});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo="foo"', {foo: true});
-});
+withOptions(
+  {
+    terse: true,
+    format: 'html',
+    runtime: function(name) {
+      return 'pug.' + name;
+    },
+  },
+  function() {
+    test([], '');
+    test([{name: 'foo', val: 'false', mustEscape: true}], '');
+    test([{name: 'foo', val: 'true', mustEscape: true}], ' foo');
+    test([{name: 'foo', val: false, mustEscape: true}], '');
+    test([{name: 'foo', val: true, mustEscape: true}], ' foo');
+    test([{name: 'foo', val: 'foo', mustEscape: true}], '', {foo: false});
+    test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo', {foo: true});
+    test([{name: 'foo', val: '"foo"', mustEscape: true}], ' foo="foo"');
+    test(
+      [
+        {name: 'foo', val: '"foo"', mustEscape: true},
+        {name: 'bar', val: '"bar"', mustEscape: true},
+      ],
+      ' foo="foo" bar="bar"'
+    );
+    test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo="fooo"', {
+      foo: 'fooo',
+    });
+    test(
+      [
+        {name: 'foo', val: 'foo', mustEscape: true},
+        {name: 'bar', val: 'bar', mustEscape: true},
+      ],
+      ' foo="fooo" bar="baro"',
+      {foo: 'fooo', bar: 'baro'}
+    );
+    test(
+      [{name: 'style', val: '{color: "red"}', mustEscape: true}],
+      ' style="color:red;"'
+    );
+    test(
+      [{name: 'style', val: '{color: color}', mustEscape: true}],
+      ' style="color:red;"',
+      {color: 'red'}
+    );
+    test(
+      [
+        {name: 'class', val: '"foo"', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      ' class="foo bar baz"'
+    );
+    test(
+      [
+        {name: 'class', val: '{foo: foo}', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      ' class="foo bar baz"',
+      {foo: true}
+    );
+    test(
+      [
+        {name: 'class', val: '{foo: foo}', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      ' class="bar baz"',
+      {foo: false}
+    );
+    test(
+      [
+        {name: 'class', val: 'foo', mustEscape: true},
+        {name: 'class', val: '"<str>"', mustEscape: true},
+      ],
+      ' class="&lt;foo&gt; &lt;str&gt;"',
+      {foo: '<foo>'}
+    );
+    test(
+      [
+        {name: 'foo', val: '"foo"', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      ' class="bar baz" foo="foo"'
+    );
+    test(
+      [
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+        {name: 'foo', val: '"foo"', mustEscape: true},
+      ],
+      ' class="bar baz" foo="foo"'
+    );
+    test([{name: 'foo', val: '"<foo>"', mustEscape: false}], ' foo="<foo>"');
+    test(
+      [{name: 'foo', val: '"<foo>"', mustEscape: true}],
+      ' foo="&lt;foo&gt;"'
+    );
+    test([{name: 'foo', val: 'foo', mustEscape: false}], ' foo="<foo>"', {
+      foo: '<foo>',
+    });
+    test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo="&lt;foo&gt;"', {
+      foo: '<foo>',
+    });
+  }
+);
+withOptions(
+  {
+    terse: false,
+    format: 'html',
+    runtime: function(name) {
+      return 'pug.' + name;
+    },
+  },
+  function() {
+    test([{name: 'foo', val: 'false', mustEscape: true}], '');
+    test([{name: 'foo', val: 'true', mustEscape: true}], ' foo="foo"');
+    test([{name: 'foo', val: false, mustEscape: true}], '');
+    test([{name: 'foo', val: true, mustEscape: true}], ' foo="foo"');
+    test([{name: 'foo', val: 'foo', mustEscape: true}], '', {foo: false});
+    test([{name: 'foo', val: 'foo', mustEscape: true}], ' foo="foo"', {
+      foo: true,
+    });
+  }
+);
 
-withOptions({terse: true, format: 'object', runtime: function (name) { return 'pug.' + name; }}, function () {
-  test([], {});
-  test([{name: 'foo', val: 'false', mustEscape: true}], {foo: false});
-  test([{name: 'foo', val: 'true', mustEscape: true}], {foo: true});
-  test([{name: 'foo', val: false, mustEscape: true}], {foo: false});
-  test([{name: 'foo', val: true, mustEscape: true}], {foo: true});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], {foo: false}, {foo: false});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], {foo: true}, {foo: true});
-  test([{name: 'foo', val: '"foo"', mustEscape: true}], {foo: 'foo'});
-  test([{name: 'foo', val: '"foo"', mustEscape: true}, {name: 'bar', val: '"bar"', mustEscape: true}], {foo: 'foo', bar: 'bar'});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], {foo: 'fooo'}, {foo: 'fooo'});
-  test([{name: 'foo', val: 'foo', mustEscape: true}, {name: 'bar', val: 'bar', mustEscape: true}], {foo: 'fooo', bar: 'baro'}, {foo: 'fooo', bar: 'baro'});
-  test([{name: 'style', val: '{color: "red"}', mustEscape: true}], {style: 'color:red;'});
-  test([{name: 'style', val: '{color: color}', mustEscape: true}], {style: 'color:red;'}, {color: 'red'});
-  test([{name: 'class', val: '"foo"', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], {'class': 'foo bar baz'});
-  test([{name: 'class', val: '{foo: foo}', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], {'class': 'foo bar baz'}, {foo: true});
-  test([{name: 'class', val: '{foo: foo}', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], {'class': 'bar baz'}, {foo: false});
-  test([{name: 'class', val: 'foo', mustEscape: true}, {name: 'class', val: '"<str>"', mustEscape: true}], {'class': '&lt;foo&gt; &lt;str&gt;'}, {foo: '<foo>'});
-  test([{name: 'foo', val: '"foo"', mustEscape: true}, {name: 'class', val: '["bar", "baz"]', mustEscape: true}], {'class': 'bar baz', foo: 'foo'});
-  test([{name: 'class', val: '["bar", "baz"]', mustEscape: true}, {name: 'foo', val: '"foo"', mustEscape: true}], {'class': 'bar baz', foo: 'foo'});
-  test([{name: 'foo', val: '"<foo>"', mustEscape: false}], {foo: "<foo>"});
-  test([{name: 'foo', val: '"<foo>"', mustEscape: true}], {foo: "&lt;foo&gt;"});
-  test([{name: 'foo', val: 'foo', mustEscape: false}], {foo: "<foo>"}, {foo: '<foo>'});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], {foo: "&lt;foo&gt;"}, {foo: '<foo>'});
-});
-withOptions({terse: false, format: 'object', runtime: function (name) { return 'pug.' + name; }}, function () {
-  test([{name: 'foo', val: 'false', mustEscape: true}], {foo: false});
-  test([{name: 'foo', val: 'true', mustEscape: true}], {foo: true});
-  test([{name: 'foo', val: false, mustEscape: true}], {foo: false});
-  test([{name: 'foo', val: true, mustEscape: true}], {foo: true});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], {foo: false}, {foo: false});
-  test([{name: 'foo', val: 'foo', mustEscape: true}], {foo: true}, {foo: true});
-});
+withOptions(
+  {
+    terse: true,
+    format: 'object',
+    runtime: function(name) {
+      return 'pug.' + name;
+    },
+  },
+  function() {
+    test([], {});
+    test([{name: 'foo', val: 'false', mustEscape: true}], {foo: false});
+    test([{name: 'foo', val: 'true', mustEscape: true}], {foo: true});
+    test([{name: 'foo', val: false, mustEscape: true}], {foo: false});
+    test([{name: 'foo', val: true, mustEscape: true}], {foo: true});
+    test(
+      [{name: 'foo', val: 'foo', mustEscape: true}],
+      {foo: false},
+      {foo: false}
+    );
+    test(
+      [{name: 'foo', val: 'foo', mustEscape: true}],
+      {foo: true},
+      {foo: true}
+    );
+    test([{name: 'foo', val: '"foo"', mustEscape: true}], {foo: 'foo'});
+    test(
+      [
+        {name: 'foo', val: '"foo"', mustEscape: true},
+        {name: 'bar', val: '"bar"', mustEscape: true},
+      ],
+      {foo: 'foo', bar: 'bar'}
+    );
+    test(
+      [{name: 'foo', val: 'foo', mustEscape: true}],
+      {foo: 'fooo'},
+      {foo: 'fooo'}
+    );
+    test(
+      [
+        {name: 'foo', val: 'foo', mustEscape: true},
+        {name: 'bar', val: 'bar', mustEscape: true},
+      ],
+      {foo: 'fooo', bar: 'baro'},
+      {foo: 'fooo', bar: 'baro'}
+    );
+    test([{name: 'style', val: '{color: "red"}', mustEscape: true}], {
+      style: 'color:red;',
+    });
+    test(
+      [{name: 'style', val: '{color: color}', mustEscape: true}],
+      {style: 'color:red;'},
+      {color: 'red'}
+    );
+    test(
+      [
+        {name: 'class', val: '"foo"', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      {class: 'foo bar baz'}
+    );
+    test(
+      [
+        {name: 'class', val: '{foo: foo}', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      {class: 'foo bar baz'},
+      {foo: true}
+    );
+    test(
+      [
+        {name: 'class', val: '{foo: foo}', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      {class: 'bar baz'},
+      {foo: false}
+    );
+    test(
+      [
+        {name: 'class', val: 'foo', mustEscape: true},
+        {name: 'class', val: '"<str>"', mustEscape: true},
+      ],
+      {class: '&lt;foo&gt; &lt;str&gt;'},
+      {foo: '<foo>'}
+    );
+    test(
+      [
+        {name: 'foo', val: '"foo"', mustEscape: true},
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+      ],
+      {class: 'bar baz', foo: 'foo'}
+    );
+    test(
+      [
+        {name: 'class', val: '["bar", "baz"]', mustEscape: true},
+        {name: 'foo', val: '"foo"', mustEscape: true},
+      ],
+      {class: 'bar baz', foo: 'foo'}
+    );
+    test([{name: 'foo', val: '"<foo>"', mustEscape: false}], {foo: '<foo>'});
+    test([{name: 'foo', val: '"<foo>"', mustEscape: true}], {
+      foo: '&lt;foo&gt;',
+    });
+    test(
+      [{name: 'foo', val: 'foo', mustEscape: false}],
+      {foo: '<foo>'},
+      {foo: '<foo>'}
+    );
+    test(
+      [{name: 'foo', val: 'foo', mustEscape: true}],
+      {foo: '&lt;foo&gt;'},
+      {foo: '<foo>'}
+    );
+  }
+);
+withOptions(
+  {
+    terse: false,
+    format: 'object',
+    runtime: function(name) {
+      return 'pug.' + name;
+    },
+  },
+  function() {
+    test([{name: 'foo', val: 'false', mustEscape: true}], {foo: false});
+    test([{name: 'foo', val: 'true', mustEscape: true}], {foo: true});
+    test([{name: 'foo', val: false, mustEscape: true}], {foo: false});
+    test([{name: 'foo', val: true, mustEscape: true}], {foo: true});
+    test(
+      [{name: 'foo', val: 'foo', mustEscape: true}],
+      {foo: false},
+      {foo: false}
+    );
+    test(
+      [{name: 'foo', val: 'foo', mustEscape: true}],
+      {foo: true},
+      {foo: true}
+    );
+  }
+);
diff --git a/packages/pug-code-gen/index.js b/packages/pug-code-gen/index.js
index 5c45c6dbd..a75929ce9 100644
--- a/packages/pug-code-gen/index.js
+++ b/packages/pug-code-gen/index.js
@@ -13,7 +13,7 @@ var addWith = require('with');
 // This is used to prevent pretty printing inside certain tags
 var WHITE_SPACE_SENSITIVE_TAGS = {
   pre: true,
-  textarea: true
+  textarea: true,
 };
 
 var INTERNAL_VARIABLES = [
@@ -23,21 +23,20 @@ var INTERNAL_VARIABLES = [
   'pug_debug_filename',
   'pug_debug_line',
   'pug_debug_sources',
-  'pug_html'
+  'pug_html',
 ];
 
 module.exports = generateCode;
 module.exports.CodeGenerator = Compiler;
 function generateCode(ast, options) {
-  return (new Compiler(ast, options)).compile();
+  return new Compiler(ast, options).compile();
 }
 
-
 function isConstant(src) {
-  return constantinople(src, {pug: runtime, 'pug_interp': undefined});
+  return constantinople(src, {pug: runtime, pug_interp: undefined});
 }
 function toConstant(src) {
-  return constantinople.toConstant(src, {pug: runtime, 'pug_interp': undefined});
+  return constantinople.toConstant(src, {pug: runtime, pug_interp: undefined});
 }
 
 /**
@@ -71,15 +70,14 @@ function Compiler(node, options) {
   if (this.debug && this.inlineRuntimeFunctions) {
     this.runtimeFunctionsUsed.push('rethrow');
   }
-};
+}
 
 /**
  * Compiler prototype.
  */
 
 Compiler.prototype = {
-
-  runtime: function (name) {
+  runtime: function(name) {
     if (this.inlineRuntimeFunctions) {
       this.runtimeFunctionsUsed.push(name);
       return 'pug_' + name;
@@ -88,7 +86,7 @@ Compiler.prototype = {
     }
   },
 
-  error: function (message, code, node) {
+  error: function(message, code, node) {
     var err = makeError(code, message, {
       line: node.line,
       column: node.column,
@@ -103,9 +101,9 @@ Compiler.prototype = {
    * @api public
    */
 
-  compile: function(){
+  compile: function() {
     this.buf = [];
-    if (this.pp) this.buf.push("var pug_indent = [];");
+    if (this.pp) this.buf.push('var pug_indent = [];');
     this.lastBufferedIdx = -1;
     this.visit(this.node);
     if (!this.dynamicMixins) {
@@ -115,7 +113,11 @@ Compiler.prototype = {
         var mixin = this.mixins[mixinNames[i]];
         if (!mixin.used) {
           for (var x = 0; x < mixin.instances.length; x++) {
-            for (var y = mixin.instances[x].start; y < mixin.instances[x].end; y++) {
+            for (
+              var y = mixin.instances[x].start;
+              y < mixin.instances[x].end;
+              y++
+            ) {
               this.buf[y] = '';
             }
           }
@@ -123,31 +125,51 @@ Compiler.prototype = {
       }
     }
     var js = this.buf.join('\n');
-    var globals = this.options.globals ? this.options.globals.concat(INTERNAL_VARIABLES) : INTERNAL_VARIABLES;
+    var globals = this.options.globals
+      ? this.options.globals.concat(INTERNAL_VARIABLES)
+      : INTERNAL_VARIABLES;
     if (this.options.self) {
       js = 'var self = locals || {};' + js;
     } else {
-      js = addWith('locals || {}', js, globals.concat(this.runtimeFunctionsUsed.map(function (name) { return 'pug_' + name; })));
+      js = addWith(
+        'locals || {}',
+        js,
+        globals.concat(
+          this.runtimeFunctionsUsed.map(function(name) {
+            return 'pug_' + name;
+          })
+        )
+      );
     }
     if (this.debug) {
       if (this.options.includeSources) {
-        js = 'var pug_debug_sources = ' + stringify(this.options.includeSources) + ';\n' + js;
+        js =
+          'var pug_debug_sources = ' +
+          stringify(this.options.includeSources) +
+          ';\n' +
+          js;
       }
-      js = 'var pug_debug_filename, pug_debug_line;' +
+      js =
+        'var pug_debug_filename, pug_debug_line;' +
         'try {' +
         js +
         '} catch (err) {' +
         (this.inlineRuntimeFunctions ? 'pug_rethrow' : 'pug.rethrow') +
         '(err, pug_debug_filename, pug_debug_line' +
-        (
-          this.options.includeSources
+        (this.options.includeSources
           ? ', pug_debug_sources[pug_debug_filename]'
-          : ''
-        ) +
+          : '') +
         ');' +
         '}';
     }
-    return buildRuntime(this.runtimeFunctionsUsed) + 'function ' + (this.options.templateName || 'template') + '(locals) {var pug_html = "", pug_mixins = {}, pug_interp;' + js + ';return pug_html;}';
+    return (
+      buildRuntime(this.runtimeFunctionsUsed) +
+      'function ' +
+      (this.options.templateName || 'template') +
+      '(locals) {var pug_html = "", pug_mixins = {}, pug_interp;' +
+      js +
+      ';return pug_html;}'
+    );
   },
 
   /**
@@ -159,7 +181,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  setDoctype: function(name){
+  setDoctype: function(name) {
     this.doctype = doctypes[name.toLowerCase()] || '<!DOCTYPE ' + name + '>';
     this.terse = this.doctype.toLowerCase() == '<!doctype html>';
     this.xml = 0 == this.doctype.indexOf('<?xml');
@@ -173,20 +195,27 @@ Compiler.prototype = {
    * @api public
    */
 
-  buffer: function (str) {
+  buffer: function(str) {
     var self = this;
 
     str = stringify(str);
     str = str.substr(1, str.length - 2);
 
-    if (this.lastBufferedIdx == this.buf.length && this.bufferedConcatenationCount < 100) {
+    if (
+      this.lastBufferedIdx == this.buf.length &&
+      this.bufferedConcatenationCount < 100
+    ) {
       if (this.lastBufferedType === 'code') {
         this.lastBuffered += ' + "';
         this.bufferedConcatenationCount++;
       }
       this.lastBufferedType = 'text';
       this.lastBuffered += str;
-      this.buf[this.lastBufferedIdx - 1] = 'pug_html = pug_html + ' + this.bufferStartChar + this.lastBuffered + '";';
+      this.buf[this.lastBufferedIdx - 1] =
+        'pug_html = pug_html + ' +
+        this.bufferStartChar +
+        this.lastBuffered +
+        '";';
     } else {
       this.bufferedConcatenationCount = 0;
       this.buf.push('pug_html = pug_html + "' + str + '";');
@@ -204,16 +233,23 @@ Compiler.prototype = {
    * @api public
    */
 
-  bufferExpression: function (src) {
+  bufferExpression: function(src) {
     if (isConstant(src)) {
-      return this.buffer(toConstant(src) + '')
+      return this.buffer(toConstant(src) + '');
     }
-    if (this.lastBufferedIdx == this.buf.length && this.bufferedConcatenationCount < 100) {
+    if (
+      this.lastBufferedIdx == this.buf.length &&
+      this.bufferedConcatenationCount < 100
+    ) {
       this.bufferedConcatenationCount++;
       if (this.lastBufferedType === 'text') this.lastBuffered += '"';
       this.lastBufferedType = 'code';
       this.lastBuffered += ' + (' + src + ')';
-      this.buf[this.lastBufferedIdx - 1] = 'pug_html = pug_html + (' + this.bufferStartChar + this.lastBuffered + ');';
+      this.buf[this.lastBufferedIdx - 1] =
+        'pug_html = pug_html + (' +
+        this.bufferStartChar +
+        this.lastBuffered +
+        ');';
     } else {
       this.bufferedConcatenationCount = 0;
       this.buf.push('pug_html = pug_html + (' + src + ');');
@@ -233,7 +269,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  prettyIndent: function(offset, newline){
+  prettyIndent: function(offset, newline) {
     offset = offset || 0;
     newline = newline ? '\n' : '';
     this.buffer(newline + Array(this.indents + offset).join(this.pp));
@@ -248,13 +284,20 @@ Compiler.prototype = {
    * @api public
    */
 
-  visit: function(node, parent){
+  visit: function(node, parent) {
     var debug = this.debug;
 
     if (!node) {
       var msg;
       if (parent) {
-        msg = 'A child of ' + parent.type + ' (' + (parent.filename || 'Pug') + ':' + parent.line + ')';
+        msg =
+          'A child of ' +
+          parent.type +
+          ' (' +
+          (parent.filename || 'Pug') +
+          ':' +
+          parent.line +
+          ')';
       } else {
         msg = 'A top-level node';
       }
@@ -265,7 +308,8 @@ Compiler.prototype = {
     if (debug && node.debug !== false && node.type !== 'Block') {
       if (node.line) {
         var js = ';pug_debug_line = ' + node.line;
-        if (node.filename) js += ';pug_debug_filename = ' + stringify(node.filename);
+        if (node.filename)
+          js += ';pug_debug_filename = ' + stringify(node.filename);
         this.buf.push(js + ';');
       }
     }
@@ -273,23 +317,30 @@ Compiler.prototype = {
     if (!this['visit' + node.type]) {
       var msg;
       if (parent) {
-        msg = 'A child of ' + parent.type
+        msg = 'A child of ' + parent.type;
       } else {
         msg = 'A top-level node';
       }
-      msg += ' (' + (node.filename || 'Pug') + ':' + node.line + ')'
-           + ' is of type ' + node.type + ','
-           + ' which is not supported by pug-code-gen.'
+      msg +=
+        ' (' +
+        (node.filename || 'Pug') +
+        ':' +
+        node.line +
+        ')' +
+        ' is of type ' +
+        node.type +
+        ',' +
+        ' which is not supported by pug-code-gen.';
       switch (node.type) {
-      case 'Filter':
-        msg += ' Please use pug-filters to preprocess this AST.'
-        break;
-      case 'Extends':
-      case 'Include':
-      case 'NamedBlock':
-      case 'FileReference': // unlikely but for the sake of completeness
-        msg += ' Please use pug-linker to preprocess this AST.'
-        break;
+        case 'Filter':
+          msg += ' Please use pug-filters to preprocess this AST.';
+          break;
+        case 'Extends':
+        case 'Include':
+        case 'NamedBlock':
+        case 'FileReference': // unlikely but for the sake of completeness
+          msg += ' Please use pug-linker to preprocess this AST.';
+          break;
       }
       throw new TypeError(msg);
     }
@@ -304,7 +355,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitNode: function(node){
+  visitNode: function(node) {
     return this['visit' + node.type](node);
   },
 
@@ -315,7 +366,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitCase: function(node){
+  visitCase: function(node) {
     this.buf.push('switch (' + node.expr + '){');
     this.visit(node.block, node);
     this.buf.push('}');
@@ -328,7 +379,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitWhen: function(node){
+  visitWhen: function(node) {
     if ('default' == node.expr) {
       this.buf.push('default:');
     } else {
@@ -347,11 +398,11 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitLiteral: function(node){
+  visitLiteral: function(node) {
     this.buffer(node.str);
   },
 
-  visitNamedBlock: function(block){
+  visitNamedBlock: function(block) {
     return this.visitBlock(block);
   },
   /**
@@ -361,20 +412,30 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitBlock: function(block){
+  visitBlock: function(block) {
     var escapePrettyMode = this.escapePrettyMode;
     var pp = this.pp;
 
     // Pretty print multi-line text
-    if (pp && block.nodes.length > 1 && !escapePrettyMode &&
-        block.nodes[0].type === 'Text' && block.nodes[1].type === 'Text' ) {
+    if (
+      pp &&
+      block.nodes.length > 1 &&
+      !escapePrettyMode &&
+      block.nodes[0].type === 'Text' &&
+      block.nodes[1].type === 'Text'
+    ) {
       this.prettyIndent(1, true);
     }
     for (var i = 0; i < block.nodes.length; ++i) {
       // Pretty print text
-      if (pp && i > 0 && !escapePrettyMode &&
-          block.nodes[i].type === 'Text' && block.nodes[i-1].type === 'Text' &&
-          /\n$/.test(block.nodes[i - 1].val)) {
+      if (
+        pp &&
+        i > 0 &&
+        !escapePrettyMode &&
+        block.nodes[i].type === 'Text' &&
+        block.nodes[i - 1].type === 'Text' &&
+        /\n$/.test(block.nodes[i - 1].val)
+      ) {
         this.prettyIndent(1, false);
       }
       this.visit(block.nodes[i], block);
@@ -388,10 +449,13 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitMixinBlock: function(block){
-    if (this.pp) this.buf.push("pug_indent.push('" + Array(this.indents + 1).join(this.pp) + "');");
+  visitMixinBlock: function(block) {
+    if (this.pp)
+      this.buf.push(
+        "pug_indent.push('" + Array(this.indents + 1).join(this.pp) + "');"
+      );
     this.buf.push('block && block();');
-    if (this.pp) this.buf.push("pug_indent.pop();");
+    if (this.pp) this.buf.push('pug_indent.pop();');
   },
 
   /**
@@ -403,7 +467,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitDoctype: function(doctype){
+  visitDoctype: function(doctype) {
     if (doctype && (doctype.val || !this.doctype)) {
       this.setDoctype(doctype.val || 'html');
     }
@@ -420,24 +484,29 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitMixin: function(mixin){
+  visitMixin: function(mixin) {
     var name = 'pug_mixins[';
     var args = mixin.args || '';
     var block = mixin.block;
     var attrs = mixin.attrs;
     var attrsBlocks = this.attributeBlocks(mixin.attributeBlocks);
     var pp = this.pp;
-    var dynamic = mixin.name[0]==='#';
+    var dynamic = mixin.name[0] === '#';
     var key = mixin.name;
     if (dynamic) this.dynamicMixins = true;
-    name += (dynamic ? mixin.name.substr(2,mixin.name.length-3):'"'+mixin.name+'"')+']';
+    name +=
+      (dynamic
+        ? mixin.name.substr(2, mixin.name.length - 3)
+        : '"' + mixin.name + '"') + ']';
 
     this.mixins[key] = this.mixins[key] || {used: false, instances: []};
     if (mixin.call) {
       this.mixins[key].used = true;
-      if (pp) this.buf.push("pug_indent.push('" + Array(this.indents + 1).join(pp) + "');")
+      if (pp)
+        this.buf.push(
+          "pug_indent.push('" + Array(this.indents + 1).join(pp) + "');"
+        );
       if (block || attrs.length || attrsBlocks.length) {
-
         this.buf.push(name + '.call({');
 
         if (block) {
@@ -464,7 +533,13 @@ Compiler.prototype = {
             attrsBlocks.unshift(val);
           }
           if (attrsBlocks.length > 1) {
-            this.buf.push('attributes: ' + this.runtime('merge') + '([' + attrsBlocks.join(',') + '])');
+            this.buf.push(
+              'attributes: ' +
+                this.runtime('merge') +
+                '([' +
+                attrsBlocks.join(',') +
+                '])'
+            );
           } else {
             this.buf.push('attributes: ' + attrsBlocks[0]);
           }
@@ -478,25 +553,33 @@ Compiler.prototype = {
         } else {
           this.buf.push('});');
         }
-
       } else {
         this.buf.push(name + '(' + args + ');');
       }
-      if (pp) this.buf.push("pug_indent.pop();")
+      if (pp) this.buf.push('pug_indent.pop();');
     } else {
       var mixin_start = this.buf.length;
       args = args ? args.split(',') : [];
       var rest;
       if (args.length && /^\.\.\./.test(args[args.length - 1].trim())) {
-        rest = args.pop().trim().replace(/^\.\.\./, '');
+        rest = args
+          .pop()
+          .trim()
+          .replace(/^\.\.\./, '');
       }
       // we need use pug_interp here for v8: https://code.google.com/p/v8/issues/detail?id=4165
       // once fixed, use this: this.buf.push(name + ' = function(' + args.join(',') + '){');
       this.buf.push(name + ' = pug_interp = function(' + args.join(',') + '){');
-      this.buf.push('var block = (this && this.block), attributes = (this && this.attributes) || {};');
+      this.buf.push(
+        'var block = (this && this.block), attributes = (this && this.attributes) || {};'
+      );
       if (rest) {
         this.buf.push('var ' + rest + ' = [];');
-        this.buf.push('for (pug_interp = ' + args.length + '; pug_interp < arguments.length; pug_interp++) {');
+        this.buf.push(
+          'for (pug_interp = ' +
+            args.length +
+            '; pug_interp < arguments.length; pug_interp++) {'
+        );
         this.buf.push('  ' + rest + '.push(arguments[pug_interp]);');
         this.buf.push('}');
       }
@@ -518,18 +601,19 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitTag: function(tag, interpolated){
+  visitTag: function(tag, interpolated) {
     this.indents++;
-    var name = tag.name
-      , pp = this.pp
-      , self = this;
+    var name = tag.name,
+      pp = this.pp,
+      self = this;
 
     function bufferName() {
       if (interpolated) self.bufferExpression(tag.expr);
       else self.buffer(name);
     }
 
-    if (WHITE_SPACE_SENSITIVE_TAGS[tag.name] === true) this.escapePrettyMode = true;
+    if (WHITE_SPACE_SENSITIVE_TAGS[tag.name] === true)
+      this.escapePrettyMode = true;
 
     if (!this.hasCompiledTag) {
       if (!this.hasCompiledDoctype && 'html' == name) {
@@ -539,37 +623,56 @@ Compiler.prototype = {
     }
 
     // pretty print
-    if (pp && !tag.isInline)
-      this.prettyIndent(0, true);
+    if (pp && !tag.isInline) this.prettyIndent(0, true);
     if (tag.selfClosing || (!this.xml && selfClosing[tag.name])) {
       this.buffer('<');
       bufferName();
-      this.visitAttributes(tag.attrs, this.attributeBlocks(tag.attributeBlocks));
+      this.visitAttributes(
+        tag.attrs,
+        this.attributeBlocks(tag.attributeBlocks)
+      );
       if (this.terse && !tag.selfClosing) {
         this.buffer('>');
       } else {
         this.buffer('/>');
       }
       // if it is non-empty throw an error
-      if (tag.code ||
-          tag.block &&
+      if (
+        tag.code ||
+        (tag.block &&
           !(tag.block.type === 'Block' && tag.block.nodes.length === 0) &&
-          tag.block.nodes.some(function (tag) {
-            return tag.type !== 'Text' || !/^\s*$/.test(tag.val)
-          })) {
-        this.error(name + ' is a self closing element: <'+name+'/> but contains nested content.', 'SELF_CLOSING_CONTENT', tag);
+          tag.block.nodes.some(function(tag) {
+            return tag.type !== 'Text' || !/^\s*$/.test(tag.val);
+          }))
+      ) {
+        this.error(
+          name +
+            ' is a self closing element: <' +
+            name +
+            '/> but contains nested content.',
+          'SELF_CLOSING_CONTENT',
+          tag
+        );
       }
     } else {
       // Optimize attributes buffering
       this.buffer('<');
       bufferName();
-      this.visitAttributes(tag.attrs, this.attributeBlocks(tag.attributeBlocks));
+      this.visitAttributes(
+        tag.attrs,
+        this.attributeBlocks(tag.attributeBlocks)
+      );
       this.buffer('>');
       if (tag.code) this.visitCode(tag.code);
       this.visit(tag.block, tag);
 
       // pretty print
-      if (pp && !tag.isInline && WHITE_SPACE_SENSITIVE_TAGS[tag.name] !== true && !tagCanInline(tag))
+      if (
+        pp &&
+        !tag.isInline &&
+        WHITE_SPACE_SENSITIVE_TAGS[tag.name] !== true &&
+        !tagCanInline(tag)
+      )
         this.prettyIndent(0, true);
 
       this.buffer('</');
@@ -577,7 +680,8 @@ Compiler.prototype = {
       this.buffer('>');
     }
 
-    if (WHITE_SPACE_SENSITIVE_TAGS[tag.name] === true) this.escapePrettyMode = false;
+    if (WHITE_SPACE_SENSITIVE_TAGS[tag.name] === true)
+      this.escapePrettyMode = false;
 
     this.indents--;
   },
@@ -600,7 +704,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitText: function(text){
+  visitText: function(text) {
     this.buffer(text.val);
   },
 
@@ -611,7 +715,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitComment: function(comment){
+  visitComment: function(comment) {
     if (!comment.buffer) return;
     if (this.pp) this.prettyIndent(1, true);
     this.buffer('<!--' + comment.val + '-->');
@@ -635,7 +739,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitBlockComment: function(comment){
+  visitBlockComment: function(comment) {
     if (!comment.buffer) return;
     if (this.pp) this.prettyIndent(1, true);
     this.buffer('<!--' + (comment.val || ''));
@@ -653,7 +757,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitCode: function(code){
+  visitCode: function(code) {
     // Wrap code blocks with {}.
     // we only wrap unbuffered code blocks ATM
     // since they are usually flow control
@@ -661,8 +765,9 @@ Compiler.prototype = {
     // Buffer code
     if (code.buffer) {
       var val = code.val.trim();
-      val = 'null == (pug_interp = '+val+') ? "" : pug_interp';
-      if (code.mustEscape !== false) val = this.runtime('escape') + '(' + val + ')';
+      val = 'null == (pug_interp = ' + val + ') ? "" : pug_interp';
+      if (code.mustEscape !== false)
+        val = this.runtime('escape') + '(' + val + ')';
       this.bufferExpression(val);
     } else {
       this.buf.push(code.val);
@@ -683,14 +788,14 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitConditional: function(cond){
+  visitConditional: function(cond) {
     var test = cond.test;
     this.buf.push('if (' + test + ') {');
     this.visit(cond.consequent, cond);
-    this.buf.push('}')
+    this.buf.push('}');
     if (cond.alternate) {
       if (cond.alternate.type === 'Conditional') {
-        this.buf.push('else')
+        this.buf.push('else');
         this.visitConditional(cond.alternate);
       } else {
         this.buf.push('else {');
@@ -707,7 +812,7 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitWhile: function(loop){
+  visitWhile: function(loop) {
     var test = loop.test;
     this.buf.push('while (' + test + ') {');
     this.visit(loop.block, loop);
@@ -721,23 +826,41 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitEach: function(each){
+  visitEach: function(each) {
     var indexVarName = each.key || 'pug_index' + this.eachCount;
     this.eachCount++;
 
-    this.buf.push(''
-      + '// iterate ' + each.obj + '\n'
-      + ';(function(){\n'
-      + '  var $$obj = ' + each.obj + ';\n'
-      + '  if (\'number\' == typeof $$obj.length) {');
+    this.buf.push(
+      '' +
+        '// iterate ' +
+        each.obj +
+        '\n' +
+        ';(function(){\n' +
+        '  var $$obj = ' +
+        each.obj +
+        ';\n' +
+        "  if ('number' == typeof $$obj.length) {"
+    );
 
     if (each.alternate) {
       this.buf.push('    if ($$obj.length) {');
     }
 
-    this.buf.push(''
-      + '      for (var ' + indexVarName + ' = 0, $$l = $$obj.length; ' + indexVarName + ' < $$l; ' + indexVarName + '++) {\n'
-      + '        var ' + each.val + ' = $$obj[' + indexVarName + '];');
+    this.buf.push(
+      '' +
+        '      for (var ' +
+        indexVarName +
+        ' = 0, $$l = $$obj.length; ' +
+        indexVarName +
+        ' < $$l; ' +
+        indexVarName +
+        '++) {\n' +
+        '        var ' +
+        each.val +
+        ' = $$obj[' +
+        indexVarName +
+        '];'
+    );
 
     this.visit(each.block, each);
 
@@ -749,12 +872,20 @@ Compiler.prototype = {
       this.buf.push('    }');
     }
 
-    this.buf.push(''
-      + '  } else {\n'
-      + '    var $$l = 0;\n'
-      + '    for (var ' + indexVarName + ' in $$obj) {\n'
-      + '      $$l++;\n'
-      + '      var ' + each.val + ' = $$obj[' + indexVarName + '];');
+    this.buf.push(
+      '' +
+        '  } else {\n' +
+        '    var $$l = 0;\n' +
+        '    for (var ' +
+        indexVarName +
+        ' in $$obj) {\n' +
+        '      $$l++;\n' +
+        '      var ' +
+        each.val +
+        ' = $$obj[' +
+        indexVarName +
+        '];'
+    );
 
     this.visit(each.block, each);
 
@@ -767,10 +898,18 @@ Compiler.prototype = {
     this.buf.push('  }\n}).call(this);\n');
   },
 
-  visitEachOf: function(each){
-    this.buf.push(''
-      + '// iterate ' + each.obj + '\n'
-      + 'for (const ' + each.val + ' of ' + each.obj + ') {\n')
+  visitEachOf: function(each) {
+    this.buf.push(
+      '' +
+        '// iterate ' +
+        each.obj +
+        '\n' +
+        'for (const ' +
+        each.val +
+        ' of ' +
+        each.obj +
+        ') {\n'
+    );
 
     this.visit(each.block, each);
 
@@ -784,16 +923,32 @@ Compiler.prototype = {
    * @api public
    */
 
-  visitAttributes: function(attrs, attributeBlocks){
+  visitAttributes: function(attrs, attributeBlocks) {
     if (attributeBlocks.length) {
       if (attrs.length) {
         var val = this.attrs(attrs);
         attributeBlocks.unshift(val);
       }
       if (attributeBlocks.length > 1) {
-        this.bufferExpression(this.runtime('attrs') + '(' + this.runtime('merge') + '([' + attributeBlocks.join(',') + ']), ' + stringify(this.terse) + ')');
+        this.bufferExpression(
+          this.runtime('attrs') +
+            '(' +
+            this.runtime('merge') +
+            '([' +
+            attributeBlocks.join(',') +
+            ']), ' +
+            stringify(this.terse) +
+            ')'
+        );
       } else {
-        this.bufferExpression(this.runtime('attrs') + '(' + attributeBlocks[0] + ', ' + stringify(this.terse) + ')');
+        this.bufferExpression(
+          this.runtime('attrs') +
+            '(' +
+            attributeBlocks[0] +
+            ', ' +
+            stringify(this.terse) +
+            ')'
+        );
       }
     } else if (attrs.length) {
       this.attrs(attrs, true);
@@ -804,13 +959,13 @@ Compiler.prototype = {
    * Compile attributes.
    */
 
-  attrs: function(attrs, buffer){
+  attrs: function(attrs, buffer) {
     var res = compileAttrs(attrs, {
       terse: this.terse,
       format: buffer ? 'html' : 'object',
-      runtime: this.runtime.bind(this)
+      runtime: this.runtime.bind(this),
     });
-    if (buffer)  {
+    if (buffer) {
       this.bufferExpression(res);
     }
     return res;
@@ -820,15 +975,18 @@ Compiler.prototype = {
    * Compile attribute blocks.
    */
 
-  attributeBlocks: function (attributeBlocks) {
-    return attributeBlocks && attributeBlocks.slice().map(function(attrBlock){
-      return attrBlock.val;
-    });
-  }
+  attributeBlocks: function(attributeBlocks) {
+    return (
+      attributeBlocks &&
+      attributeBlocks.slice().map(function(attrBlock) {
+        return attrBlock.val;
+      })
+    );
+  },
 };
 
 function tagCanInline(tag) {
-  function isInline(node){
+  function isInline(node) {
     // Recurse if the node is a block
     if (node.type === 'Block') return node.nodes.every(isInline);
     // When there is a YieldBlock here, it is an indication that the file is
diff --git a/packages/pug-error/index.js b/packages/pug-error/index.js
index 2ec94c56b..9bc75135d 100644
--- a/packages/pug-error/index.js
+++ b/packages/pug-error/index.js
@@ -13,19 +13,21 @@ function makeError(code, message, options) {
     var start = Math.max(line - 3, 0);
     var end = Math.min(lines.length, line + 3);
     // Error context
-    var context = lines.slice(start, end).map(function(text, i){
-      var curr = i + start + 1;
-      var preamble = (curr == line ? '  > ' : '    ')
-        + curr
-        + '| ';
-      var out = preamble + text;
-      if (curr === line && column > 0) {
-        out += '\n';
-        out += Array(preamble.length + column).join('-') + '^';
-      }
-      return out;
-    }).join('\n');
-    fullMessage = (filename || 'Pug') + ':' + location + '\n' + context + '\n\n' + message;
+    var context = lines
+      .slice(start, end)
+      .map(function(text, i) {
+        var curr = i + start + 1;
+        var preamble = (curr == line ? '  > ' : '    ') + curr + '| ';
+        var out = preamble + text;
+        if (curr === line && column > 0) {
+          out += '\n';
+          out += Array(preamble.length + column).join('-') + '^';
+        }
+        return out;
+      })
+      .join('\n');
+    fullMessage =
+      (filename || 'Pug') + ':' + location + '\n' + context + '\n\n' + message;
   } else {
     fullMessage = (filename || 'Pug') + ':' + location + '\n\n' + message;
   }
@@ -36,13 +38,13 @@ function makeError(code, message, options) {
   err.column = column;
   err.filename = filename;
   err.src = src;
-  err.toJSON = function () {
+  err.toJSON = function() {
     return {
       code: this.code,
       msg: this.msg,
       line: this.line,
       column: this.column,
-      filename: this.filename
+      filename: this.filename,
     };
   };
   return err;
diff --git a/packages/pug-error/test/index.test.js b/packages/pug-error/test/index.test.js
index 4ad01ef90..19aca14a3 100644
--- a/packages/pug-error/test/index.test.js
+++ b/packages/pug-error/test/index.test.js
@@ -3,19 +3,30 @@
 var assert = require('assert');
 var error = require('../');
 
-describe('with a source', function () {
-  test('and a filename', function () {
-    var err = error('MY_CODE', 'My message', {line: 3, filename: 'myfile', src: 'foo\nbar\nbaz\nbash\nbing'});
-    expect(err.message).toBe('myfile:3\n    1| foo\n    2| bar\n  > 3| baz\n    4| bash\n    5| bing\n\nMy message');
+describe('with a source', function() {
+  test('and a filename', function() {
+    var err = error('MY_CODE', 'My message', {
+      line: 3,
+      filename: 'myfile',
+      src: 'foo\nbar\nbaz\nbash\nbing',
+    });
+    expect(err.message).toBe(
+      'myfile:3\n    1| foo\n    2| bar\n  > 3| baz\n    4| bash\n    5| bing\n\nMy message'
+    );
     expect(err.code).toBe('PUG:MY_CODE');
     expect(err.msg).toBe('My message');
     expect(err.line).toBe(3);
     expect(err.filename).toBe('myfile');
     expect(err.src).toBe('foo\nbar\nbaz\nbash\nbing');
   });
-  test('and no filename', function () {
-    var err = error('MY_CODE', 'My message', {line: 3, src: 'foo\nbar\nbaz\nbash\nbing'});
-    expect(err.message).toBe('Pug:3\n    1| foo\n    2| bar\n  > 3| baz\n    4| bash\n    5| bing\n\nMy message');
+  test('and no filename', function() {
+    var err = error('MY_CODE', 'My message', {
+      line: 3,
+      src: 'foo\nbar\nbaz\nbash\nbing',
+    });
+    expect(err.message).toBe(
+      'Pug:3\n    1| foo\n    2| bar\n  > 3| baz\n    4| bash\n    5| bing\n\nMy message'
+    );
     expect(err.code).toBe('PUG:MY_CODE');
     expect(err.msg).toBe('My message');
     expect(err.line).toBe(3);
@@ -24,8 +35,8 @@ describe('with a source', function () {
   });
 });
 
-describe('without source', function () {
-  test('and with a filename', function () {
+describe('without source', function() {
+  test('and with a filename', function() {
     var err = error('MY_CODE', 'My message', {line: 3, filename: 'myfile'});
     expect(err.message).toBe('myfile:3\n\nMy message');
     expect(err.code).toBe('PUG:MY_CODE');
@@ -34,7 +45,7 @@ describe('without source', function () {
     expect(err.filename).toBe('myfile');
     expect(err.src).toBe(undefined);
   });
-  test('and with no filename', function () {
+  test('and with no filename', function() {
     var err = error('MY_CODE', 'My message', {line: 3});
     expect(err.message).toBe('Pug:3\n\nMy message');
     expect(err.code).toBe('PUG:MY_CODE');
@@ -45,17 +56,24 @@ describe('without source', function () {
   });
 });
 
-describe('with column', function () {
-  test('and with a filename', function () {
-    var err = error('MY_CODE', 'My message', {line: 3, column: 2, filename: 'myfile', src: 'foo\nbar\nbaz\nbash\nbing'});
-    expect(err.message).toBe('myfile:3:2\n    1| foo\n    2| bar\n  > 3| baz\n--------^\n    4| bash\n    5| bing\n\nMy message');
+describe('with column', function() {
+  test('and with a filename', function() {
+    var err = error('MY_CODE', 'My message', {
+      line: 3,
+      column: 2,
+      filename: 'myfile',
+      src: 'foo\nbar\nbaz\nbash\nbing',
+    });
+    expect(err.message).toBe(
+      'myfile:3:2\n    1| foo\n    2| bar\n  > 3| baz\n--------^\n    4| bash\n    5| bing\n\nMy message'
+    );
     expect(err.code).toBe('PUG:MY_CODE');
     expect(err.msg).toBe('My message');
     expect(err.line).toBe(3);
     expect(err.filename).toBe('myfile');
     expect(err.src).toBe('foo\nbar\nbaz\nbash\nbing');
   });
-  test('and with no filename', function () {
+  test('and with no filename', function() {
     var err = error('MY_CODE', 'My message', {line: 3, column: 1});
     expect(err.message).toBe('Pug:3:1\n\nMy message');
     expect(err.code).toBe('PUG:MY_CODE');
@@ -66,22 +84,31 @@ describe('with column', function () {
   });
 });
 
-describe('invalid information', function () {
-  test('negative column', function () {
-    var err = error('MY_CODE', 'My message', {line: 3, column: -1, src: 'foo\nbar\nbaz\nbash\nbing'});
-    expect(err.message).toBe('Pug:3:-1\n    1| foo\n    2| bar\n  > 3| baz\n    4| bash\n    5| bing\n\nMy message');
+describe('invalid information', function() {
+  test('negative column', function() {
+    var err = error('MY_CODE', 'My message', {
+      line: 3,
+      column: -1,
+      src: 'foo\nbar\nbaz\nbash\nbing',
+    });
+    expect(err.message).toBe(
+      'Pug:3:-1\n    1| foo\n    2| bar\n  > 3| baz\n    4| bash\n    5| bing\n\nMy message'
+    );
     expect(err.code).toBe('PUG:MY_CODE');
     expect(err.msg).toBe('My message');
     expect(err.line).toBe(3);
     expect(err.filename).toBe(undefined);
     expect(err.src).toBe('foo\nbar\nbaz\nbash\nbing');
-  })
-  test('out of range line', function () {
+  });
+  test('out of range line', function() {
     check(0);
     check(6);
 
     function check(line) {
-      var err = error('MY_CODE', 'My message', {line: line, src: 'foo\nbar\nbaz\nbash\nbing'});
+      var err = error('MY_CODE', 'My message', {
+        line: line,
+        src: 'foo\nbar\nbaz\nbash\nbing',
+      });
       expect(err.message).toBe('Pug:' + line + '\n\nMy message');
       expect(err.code).toBe('PUG:MY_CODE');
       expect(err.msg).toBe('My message');
diff --git a/packages/pug-filters/index.js b/packages/pug-filters/index.js
index 7a687956e..96cc17f4e 100644
--- a/packages/pug-filters/index.js
+++ b/packages/pug-filters/index.js
@@ -1,4 +1,4 @@
 'use strict';
 
 exports.runFilter = require('./lib/run-filter');
-exports.handleFilters = require('./lib/handle-filters');
\ No newline at end of file
+exports.handleFilters = require('./lib/handle-filters');
diff --git a/packages/pug-filters/lib/handle-filters.js b/packages/pug-filters/lib/handle-filters.js
index 91cac9539..6696290e8 100644
--- a/packages/pug-filters/lib/handle-filters.js
+++ b/packages/pug-filters/lib/handle-filters.js
@@ -9,56 +9,63 @@ var runFilter = require('./run-filter');
 module.exports = handleFilters;
 function handleFilters(ast, filters, options, filterAliases) {
   options = options || {};
-  walk(ast, function (node) {
-    var dir = node.filename ? dirname(node.filename) : null;
-    if (node.type === 'Filter') {
-      handleNestedFilters(node, filters, options, filterAliases);
-      var text = getBodyAsText(node);
-      var attrs = getAttributes(node, options);
-      attrs.filename = node.filename;
-      node.type = 'Text';
-      node.val = filterWithFallback(node, text, attrs);
-    } else if (node.type === 'RawInclude' && node.filters.length) {
-      var firstFilter = node.filters.pop();
-      var attrs = getAttributes(firstFilter, options);
-      var filename = attrs.filename = node.file.fullPath;
-      var str = node.file.str;
-      node.type = 'Text';
-      node.val = filterFileWithFallback(firstFilter, filename, str, attrs);
-      node.filters.slice().reverse().forEach(function (filter) {
-        var attrs = getAttributes(filter, options);
-        attrs.filename = filename;
-        node.val = filterWithFallback(filter, node.val, attrs);
-      });
-      node.filters = undefined;
-      node.file = undefined;
-    }
+  walk(
+    ast,
+    function(node) {
+      var dir = node.filename ? dirname(node.filename) : null;
+      if (node.type === 'Filter') {
+        handleNestedFilters(node, filters, options, filterAliases);
+        var text = getBodyAsText(node);
+        var attrs = getAttributes(node, options);
+        attrs.filename = node.filename;
+        node.type = 'Text';
+        node.val = filterWithFallback(node, text, attrs);
+      } else if (node.type === 'RawInclude' && node.filters.length) {
+        var firstFilter = node.filters.pop();
+        var attrs = getAttributes(firstFilter, options);
+        var filename = (attrs.filename = node.file.fullPath);
+        var str = node.file.str;
+        node.type = 'Text';
+        node.val = filterFileWithFallback(firstFilter, filename, str, attrs);
+        node.filters
+          .slice()
+          .reverse()
+          .forEach(function(filter) {
+            var attrs = getAttributes(filter, options);
+            attrs.filename = filename;
+            node.val = filterWithFallback(filter, node.val, attrs);
+          });
+        node.filters = undefined;
+        node.file = undefined;
+      }
 
-    function filterWithFallback(filter, text, attrs, funcName) {
-      try {
+      function filterWithFallback(filter, text, attrs, funcName) {
+        try {
+          var filterName = getFilterName(filter);
+          if (filters && filters[filterName]) {
+            return filters[filterName](text, attrs);
+          } else {
+            return runFilter(filterName, text, attrs, dir, funcName);
+          }
+        } catch (ex) {
+          if (ex.code === 'UNKNOWN_FILTER') {
+            throw error(ex.code, ex.message, filter);
+          }
+          throw ex;
+        }
+      }
+
+      function filterFileWithFallback(filter, filename, text, attrs) {
         var filterName = getFilterName(filter);
         if (filters && filters[filterName]) {
           return filters[filterName](text, attrs);
         } else {
-          return runFilter(filterName, text, attrs, dir, funcName);
-        }
-      } catch (ex) {
-        if (ex.code === 'UNKNOWN_FILTER') {
-          throw error(ex.code, ex.message, filter);
+          return filterWithFallback(filter, filename, attrs, 'renderFile');
         }
-        throw ex;
       }
-    }
-
-    function filterFileWithFallback(filter, filename, text, attrs) {
-      var filterName = getFilterName(filter);
-      if (filters && filters[filterName]) {
-        return filters[filterName](text, attrs);
-      } else {
-        return filterWithFallback(filter, filename, attrs, 'renderFile');
-      }
-    }
-  }, {includeDependencies: true});
+    },
+    {includeDependencies: true}
+  );
   function getFilterName(filter) {
     var filterName = filter.name;
     if (filterAliases && filterAliases[filterName]) {
@@ -66,9 +73,13 @@ function handleFilters(ast, filters, options, filterAliases) {
       if (filterAliases[filterName]) {
         throw error(
           'FILTER_ALISE_CHAIN',
-          'The filter "' + filter.name + '" is an alias for "' + filterName +
-          '", which is an alias for "' + filterAliases[filterName] +
-          '".  Pug does not support chains of filter aliases.',
+          'The filter "' +
+            filter.name +
+            '" is an alias for "' +
+            filterName +
+            '", which is an alias for "' +
+            filterAliases[filterName] +
+            '".  Pug does not support chains of filter aliases.',
           filter
         );
       }
@@ -76,34 +87,47 @@ function handleFilters(ast, filters, options, filterAliases) {
     return filterName;
   }
   return ast;
-};
+}
 
 function handleNestedFilters(node, filters, options, filterAliases) {
   if (node.block.nodes[0] && node.block.nodes[0].type === 'Filter') {
-    node.block.nodes[0] = handleFilters(node.block, filters, options, filterAliases).nodes[0];
+    node.block.nodes[0] = handleFilters(
+      node.block,
+      filters,
+      options,
+      filterAliases
+    ).nodes[0];
   }
 }
 
 function getBodyAsText(node) {
-  return node.block.nodes.map(
-    function(node){ return node.val; }
-  ).join('');
+  return node.block.nodes
+    .map(function(node) {
+      return node.val;
+    })
+    .join('');
 }
 
 function getAttributes(node, options) {
   var attrs = {};
-  node.attrs.forEach(function (attr) {
+  node.attrs.forEach(function(attr) {
     try {
-      attrs[attr.name] = attr.val === true ? true : constantinople.toConstant(attr.val);
+      attrs[attr.name] =
+        attr.val === true ? true : constantinople.toConstant(attr.val);
     } catch (ex) {
       if (/not constant/.test(ex.message)) {
-        throw error('FILTER_OPTION_NOT_CONSTANT', ex.message + ' All filters are rendered compile-time so filter options must be constants.', node);
+        throw error(
+          'FILTER_OPTION_NOT_CONSTANT',
+          ex.message +
+            ' All filters are rendered compile-time so filter options must be constants.',
+          node
+        );
       }
       throw ex;
     }
   });
   var opts = options[node.name] || {};
-  Object.keys(opts).forEach(function (opt) {
+  Object.keys(opts).forEach(function(opt) {
     if (!attrs.hasOwnProperty(opt)) {
       attrs[opt] = opts[opt];
     }
diff --git a/packages/pug-filters/lib/run-filter.js b/packages/pug-filters/lib/run-filter.js
index a0cec0457..5c58b484c 100644
--- a/packages/pug-filters/lib/run-filter.js
+++ b/packages/pug-filters/lib/run-filter.js
@@ -11,7 +11,9 @@ function filter(name, str, options, currentDirectory, funcName) {
   var trPath;
   try {
     try {
-      trPath = resolve.sync('jstransformer-' + name, {basedir: currentDirectory || process.cwd()});
+      trPath = resolve.sync('jstransformer-' + name, {
+        basedir: currentDirectory || process.cwd(),
+      });
     } catch (ex) {
       trPath = require.resolve('jstransformer-' + name);
     }
diff --git a/packages/pug-filters/test/custom-filters.js b/packages/pug-filters/test/custom-filters.js
index 80da75006..74755e510 100644
--- a/packages/pug-filters/test/custom-filters.js
+++ b/packages/pug-filters/test/custom-filters.js
@@ -1,9 +1,9 @@
 var assert = require('assert');
 
 module.exports = {
-  custom: function (str, options) {
+  custom: function(str, options) {
     expect(options.opt).toBe('val');
     expect(options.num).toBe(2);
     return 'BEGIN' + str + 'END';
-  }
+  },
 };
diff --git a/packages/pug-filters/test/filter-aliases.test.js b/packages/pug-filters/test/filter-aliases.test.js
index 14caa0035..3a4bf3bf9 100644
--- a/packages/pug-filters/test/filter-aliases.test.js
+++ b/packages/pug-filters/test/filter-aliases.test.js
@@ -12,14 +12,14 @@ script
     }
   `;
 
-  const ast = parse(
-    lex(source, {filename: __filename}),
-    {filename: __filename, src: source}
-  );
+  const ast = parse(lex(source, {filename: __filename}), {
+    filename: __filename,
+    src: source,
+  });
 
   const options = {};
   const aliases = {
-    'minify': 'uglify-js',
+    minify: 'uglify-js',
   };
 
   const output = handleFilters(ast, customFilters, options, aliases);
@@ -35,15 +35,15 @@ script
     }
   `;
 
-  const ast = parse(
-    lex(source, {filename: __filename}),
-    {filename: __filename, src: source}
-  );
+  const ast = parse(lex(source, {filename: __filename}), {
+    filename: __filename,
+    src: source,
+  });
 
   const options = {};
   const aliases = {
     'minify-js': 'minify',
-    'minify': 'uglify-js',
+    minify: 'uglify-js',
   };
 
   try {
@@ -71,17 +71,16 @@ script
     }
   `;
 
-  const ast = parse(
-    lex(source, {filename: __filename}),
-    {filename: __filename, src: source}
-  );
-
+  const ast = parse(lex(source, {filename: __filename}), {
+    filename: __filename,
+    src: source,
+  });
 
   const options = {
-    'minify': {output: {beautify: true}},
+    minify: {output: {beautify: true}},
   };
   const aliases = {
-    'minify': 'uglify-js',
+    minify: 'uglify-js',
   };
 
   const output = handleFilters(ast, customFilters, options, aliases);
diff --git a/packages/pug-filters/test/index.test.js b/packages/pug-filters/test/index.test.js
index 01115ab41..d1369b586 100644
--- a/packages/pug-filters/test/index.test.js
+++ b/packages/pug-filters/test/index.test.js
@@ -9,31 +9,35 @@ process.chdir(__dirname + '/../');
 
 var testCases;
 
-testCases = fs.readdirSync(__dirname + '/cases').filter(function (name) {
+testCases = fs.readdirSync(__dirname + '/cases').filter(function(name) {
   return /\.input\.json$/.test(name);
 });
 //
-testCases.forEach(function (filename) {
-  function read (path) {
+testCases.forEach(function(filename) {
+  function read(path) {
     return fs.readFileSync(__dirname + '/cases/' + path, 'utf8');
   }
 
-  test('cases/' + filename, function () {
-    var actualAst = JSON.stringify(handleFilters(JSON.parse(read(filename)), customFilters), null, '  ');
+  test('cases/' + filename, function() {
+    var actualAst = JSON.stringify(
+      handleFilters(JSON.parse(read(filename)), customFilters),
+      null,
+      '  '
+    );
     expect(actualAst).toMatchSnapshot();
-  })
+  });
 });
 
-testCases = fs.readdirSync(__dirname + '/errors').filter(function (name) {
+testCases = fs.readdirSync(__dirname + '/errors').filter(function(name) {
   return /\.input\.json$/.test(name);
 });
 
-testCases.forEach(function (filename) {
-  function read (path) {
+testCases.forEach(function(filename) {
+  function read(path) {
     return fs.readFileSync(__dirname + '/errors/' + path, 'utf8');
   }
 
-  test('errors/' + filename, function () {
+  test('errors/' + filename, function() {
     var actual;
     try {
       handleFilters(JSON.parse(read(filename)), customFilters);
@@ -43,9 +47,9 @@ testCases.forEach(function (filename) {
       actual = {
         msg: ex.msg,
         code: ex.code,
-        line: ex.line
+        line: ex.line,
       };
     }
     expect(actual).toMatchSnapshot();
-  })
+  });
 });
diff --git a/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js b/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js
index 8c615c08e..30593b574 100644
--- a/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js
+++ b/packages/pug-filters/test/per-filter-options-applied-to-nested-filters.test.js
@@ -12,10 +12,10 @@ script
     }
   `;
 
-  const ast = parse(
-    lex(source, {filename: __filename}),
-    {filename: __filename, src: source}
-  );
+  const ast = parse(lex(source, {filename: __filename}), {
+    filename: __filename,
+    src: source,
+  });
 
   const options = {
     'uglify-js': {output: {beautify: true}},
diff --git a/packages/pug-filters/test/update-test-cases.js b/packages/pug-filters/test/update-test-cases.js
index e97423f3e..6e90996fb 100644
--- a/packages/pug-filters/test/update-test-cases.js
+++ b/packages/pug-filters/test/update-test-cases.js
@@ -9,11 +9,11 @@ var parse = require('pug-parser');
 var handleFilters = require('../').handleFilters;
 var customFilters = require('./custom-filters.js');
 
-var existing = fs.readdirSync(__dirname + '/cases').filter(function (name) {
+var existing = fs.readdirSync(__dirname + '/cases').filter(function(name) {
   return /\.input\.json$/.test(name);
 });
 
-function getError (input, filename) {
+function getError(input, filename) {
   try {
     handleFilters(input, customFilters);
     throw new Error('Expected ' + filename + ' to throw an exception.');
@@ -22,110 +22,165 @@ function getError (input, filename) {
     return {
       msg: ex.msg,
       code: ex.code,
-      line: ex.line
+      line: ex.line,
     };
   }
 }
 
-getRepo('pugjs', 'pug-parser').on('data', function (entry) {
-  var match;
-  if (entry.type === 'File' && (match = /^\/test\/cases\/(filters.*)\.expected\.json$/.exec(entry.path))) {
-    var name = match[1];
-    var filename = name + '.input.json';
-    var alreadyExists = false;
-    existing = existing.filter(function (existingName) {
-      if (existingName === filename) {
-        alreadyExists = true;
-        return false;
-      }
-      return true;
-    });
-    if (alreadyExists) {
-      var actualInputAst = getLoadedAst(entry.body.toString('utf8'));
-      try {
-        var expectedInputAst = JSON.parse(fs.readFileSync(__dirname + '/cases/' + filename, 'utf8'));
-        assert.deepEqual(expectedInputAst, actualInputAst);
-      } catch (ex) {
-        console.log('update: ' + filename);
-        fs.writeFileSync(__dirname + '/cases/' + filename, JSON.stringify(actualInputAst, null, '  '));
-      }
+getRepo('pugjs', 'pug-parser')
+  .on('data', function(entry) {
+    var match;
+    if (
+      entry.type === 'File' &&
+      (match = /^\/test\/cases\/(filters.*)\.expected\.json$/.exec(entry.path))
+    ) {
+      var name = match[1];
+      var filename = name + '.input.json';
+      var alreadyExists = false;
+      existing = existing.filter(function(existingName) {
+        if (existingName === filename) {
+          alreadyExists = true;
+          return false;
+        }
+        return true;
+      });
+      if (alreadyExists) {
+        var actualInputAst = getLoadedAst(entry.body.toString('utf8'));
+        try {
+          var expectedInputAst = JSON.parse(
+            fs.readFileSync(__dirname + '/cases/' + filename, 'utf8')
+          );
+          assert.deepEqual(expectedInputAst, actualInputAst);
+        } catch (ex) {
+          console.log('update: ' + filename);
+          fs.writeFileSync(
+            __dirname + '/cases/' + filename,
+            JSON.stringify(actualInputAst, null, '  ')
+          );
+        }
 
-      var actualAstStr = JSON.stringify(handleFilters(actualInputAst, customFilters), null, '  ');
-      try {
-        var expectedAstStr = fs.readFileSync(__dirname + '/cases/' + name + '.expected.json', 'utf8');
-        assert.equal(actualAstStr, expectedAstStr);
-      } catch (ex) {
-        console.log('update: ' + name + '.expected.json');
-        fs.writeFileSync(__dirname + '/cases/' + name + '.expected.json', actualAstStr);
+        var actualAstStr = JSON.stringify(
+          handleFilters(actualInputAst, customFilters),
+          null,
+          '  '
+        );
+        try {
+          var expectedAstStr = fs.readFileSync(
+            __dirname + '/cases/' + name + '.expected.json',
+            'utf8'
+          );
+          assert.equal(actualAstStr, expectedAstStr);
+        } catch (ex) {
+          console.log('update: ' + name + '.expected.json');
+          fs.writeFileSync(
+            __dirname + '/cases/' + name + '.expected.json',
+            actualAstStr
+          );
+        }
+      } else {
+        console.log('create: ' + filename);
+        var inputAst = getLoadedAst(entry.body.toString('utf8'));
+        fs.writeFileSync(
+          __dirname + '/cases/' + filename,
+          JSON.stringify(inputAst, null, '  ')
+        );
+        console.log('create: ' + name + '.expected.json');
+        var ast = handleFilters(inputAst, customFilters);
+        fs.writeFileSync(
+          __dirname + '/cases/' + name + '.expected.json',
+          JSON.stringify(ast, null, '  ')
+        );
       }
-    } else {
-      console.log('create: ' + filename);
-      var inputAst = getLoadedAst(entry.body.toString('utf8'));
-      fs.writeFileSync(__dirname + '/cases/' + filename, JSON.stringify(inputAst, null, '  '));
-      console.log('create: ' + name + '.expected.json');
-      var ast = handleFilters(inputAst, customFilters);
-      fs.writeFileSync(__dirname + '/cases/' + name + '.expected.json', JSON.stringify(ast, null, '  '));
     }
-  }
-}).on('end', function () {
-  existing.forEach(function (file) {
-    fs.unlinkSync(__dirname + '/cases/' + file);
-  });
-  var existingErrors = fs.readdirSync(__dirname + '/errors').filter(function (name) {
-    return /\.input\.json$/.test(name);
-  });
-  var pugRe = /\.pug$/;
-  fs.readdirSync(__dirname + '/errors-src').forEach(function (name) {
-    if (!pugRe.test(name)) return;
-    name = name.replace(pugRe, '');
-    var filename = name + '.input.json';
-    var alreadyExists = false;
-    existingErrors = existingErrors.filter(function (existingName) {
-      if (existingName === filename) {
-        alreadyExists = true;
-        return false;
-      }
-      return true;
+  })
+  .on('end', function() {
+    existing.forEach(function(file) {
+      fs.unlinkSync(__dirname + '/cases/' + file);
     });
-    if (alreadyExists) {
-      var actualTokens = parse(lex(fs.readFileSync(__dirname + '/errors-src/' + name + '.pug', 'utf8')));
-      try {
-        var expectedTokens = JSON.parse(fs.readFileSync(__dirname + '/errors/' + filename, 'utf8'));
-        assert.deepEqual(actualTokens, expectedTokens);
-      } catch (ex) {
-        console.log('update: ' + filename);
-        fs.writeFileSync(__dirname + '/errors/' + filename, JSON.stringify(actualTokens, null, '  '));
+    var existingErrors = fs
+      .readdirSync(__dirname + '/errors')
+      .filter(function(name) {
+        return /\.input\.json$/.test(name);
+      });
+    var pugRe = /\.pug$/;
+    fs.readdirSync(__dirname + '/errors-src').forEach(function(name) {
+      if (!pugRe.test(name)) return;
+      name = name.replace(pugRe, '');
+      var filename = name + '.input.json';
+      var alreadyExists = false;
+      existingErrors = existingErrors.filter(function(existingName) {
+        if (existingName === filename) {
+          alreadyExists = true;
+          return false;
+        }
+        return true;
+      });
+      if (alreadyExists) {
+        var actualTokens = parse(
+          lex(
+            fs.readFileSync(__dirname + '/errors-src/' + name + '.pug', 'utf8')
+          )
+        );
+        try {
+          var expectedTokens = JSON.parse(
+            fs.readFileSync(__dirname + '/errors/' + filename, 'utf8')
+          );
+          assert.deepEqual(actualTokens, expectedTokens);
+        } catch (ex) {
+          console.log('update: ' + filename);
+          fs.writeFileSync(
+            __dirname + '/errors/' + filename,
+            JSON.stringify(actualTokens, null, '  ')
+          );
+        }
+        var actual = getError(actualTokens, filename);
+        try {
+          var expected = JSON.parse(
+            fs.readFileSync(
+              __dirname + '/errors/' + name + '.expected.json',
+              'utf8'
+            )
+          );
+          assert.deepEqual(actual, expected);
+        } catch (ex) {
+          console.log('update: ' + name + '.expected.json');
+          fs.writeFileSync(
+            __dirname + '/errors/' + name + '.expected.json',
+            JSON.stringify(actual, null, '  ')
+          );
+        }
+      } else {
+        console.log('create: ' + filename);
+        var ast = parse(
+          lex(
+            fs.readFileSync(__dirname + '/errors-src/' + name + '.pug', 'utf8')
+          )
+        );
+        fs.writeFileSync(
+          __dirname + '/errors/' + filename,
+          JSON.stringify(ast, null, 2)
+        );
+        console.log('create: ' + name + '.expected.json');
+        var actual = getError(ast, filename);
+        fs.writeFileSync(
+          __dirname + '/errors/' + name + '.expected.json',
+          JSON.stringify(actual, null, '  ')
+        );
       }
-      var actual = getError(actualTokens, filename);
-      try {
-        var expected = JSON.parse(fs.readFileSync(__dirname + '/errors/' + name + '.expected.json', 'utf8'));
-        assert.deepEqual(actual, expected);
-      } catch (ex) {
-        console.log('update: ' + name + '.expected.json');
-        fs.writeFileSync(__dirname + '/errors/' + name + '.expected.json', JSON.stringify(actual, null, '  '));
-      }
-    } else {
-      console.log('create: ' + filename);
-      var ast = parse(lex(fs.readFileSync(__dirname + '/errors-src/' + name + '.pug', 'utf8')));
-      fs.writeFileSync(__dirname + '/errors/' + filename, JSON.stringify(ast, null, 2));
-      console.log('create: ' + name + '.expected.json');
-      var actual = getError(ast, filename);
-      fs.writeFileSync(__dirname + '/errors/' + name + '.expected.json', JSON.stringify(actual, null, '  '));
-    }
+    });
+    console.log('test cases updated');
   });
-  console.log('test cases updated');
-});
 
 function getLoadedAst(str) {
   return load(JSON.parse(str), {
-    lex: function () {
+    lex: function() {
       throw new Error('The lexer should not be used');
     },
-    parse: function () {
+    parse: function() {
       throw new Error('The parser should not be used');
     },
-    resolve: function (filename, source, options) {
+    resolve: function(filename, source, options) {
       return 'test/cases/' + filename.trim();
-    }
+    },
   });
 }
diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index 9f84f2d7c..671e96408 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -23,10 +23,14 @@ function lex(str, options) {
 function Lexer(str, options) {
   options = options || {};
   if (typeof str !== 'string') {
-    throw new Error('Expected source code to be a string but got "' + (typeof str) + '"')
+    throw new Error(
+      'Expected source code to be a string but got "' + typeof str + '"'
+    );
   }
   if (typeof options !== 'object') {
-    throw new Error('Expected "options" to be an object but got "' + (typeof options) + '"')
+    throw new Error(
+      'Expected "options" to be an object but got "' + typeof options + '"'
+    );
   }
   //Strip any UTF-8 BOM off of the start of `str`, if it exists.
   str = str.replace(/^\uFEFF/, '');
@@ -45,32 +49,36 @@ function Lexer(str, options) {
 
   this.tokens = [];
   this.ended = false;
-};
+}
 
 /**
  * Lexer prototype.
  */
 
 Lexer.prototype = {
-
   constructor: Lexer,
 
-  error: function (code, message) {
-    var err = error(code, message, {line: this.lineno, column: this.colno, filename: this.filename, src: this.originalInput});
+  error: function(code, message) {
+    var err = error(code, message, {
+      line: this.lineno,
+      column: this.colno,
+      filename: this.filename,
+      src: this.originalInput,
+    });
     throw err;
   },
 
-  assert: function (value, message) {
+  assert: function(value, message) {
     if (!value) this.error('ASSERT_FAILED', message);
   },
 
-  isExpression: function (exp) {
+  isExpression: function(exp) {
     return isExpression(exp, {
-      throw: true
+      throw: true,
     });
   },
 
-  assertExpression: function (exp, noThrow) {
+  assertExpression: function(exp, noThrow) {
     //this verifies that a JavaScript expression is valid
     try {
       this.callLexerFunction('isExpression', exp);
@@ -83,17 +91,21 @@ Lexer.prototype = {
 
       this.incrementLine(ex.loc.line - 1);
       this.incrementColumn(ex.loc.column);
-      var msg = 'Syntax Error: ' + ex.message.replace(/ \([0-9]+:[0-9]+\)$/, '');
+      var msg =
+        'Syntax Error: ' + ex.message.replace(/ \([0-9]+:[0-9]+\)$/, '');
       this.error('SYNTAX_ERROR', msg);
     }
   },
 
-  assertNestingCorrect: function (exp) {
+  assertNestingCorrect: function(exp) {
     //this verifies that code is properly nested, but allows
     //invalid JavaScript such as the contents of `attributes`
-    var res = characterParser(exp)
+    var res = characterParser(exp);
     if (res.isNesting()) {
-      this.error('INCORRECT_NESTING', 'Nesting must match on expression `' + exp + '`')
+      this.error(
+        'INCORRECT_NESTING',
+        'Nesting must match on expression `' + exp + '`'
+      );
     }
   },
 
@@ -106,35 +118,35 @@ Lexer.prototype = {
    * @api private
    */
 
-  tok: function(type, val){
+  tok: function(type, val) {
     var res = {
-      type: type, 
+      type: type,
       loc: {
         start: {
-          line: this.lineno, 
-          column: this.colno
+          line: this.lineno,
+          column: this.colno,
         },
-        filename: this.filename
-      }
+        filename: this.filename,
+      },
     };
 
     if (val !== undefined) res.val = val;
 
     return res;
   },
-  
+
   /**
    * Set the token's `loc.end` value.
-   * 
+   *
    * @param {Object} tok
    * @returns {Object}
    * @api private
    */
-  
-  tokEnd: function(tok){
+
+  tokEnd: function(tok) {
     tok.loc.end = {
       line: this.lineno,
-      column: this.colno
+      column: this.colno,
     };
     return tok;
   },
@@ -146,7 +158,7 @@ Lexer.prototype = {
    * @api private
    */
 
-  incrementLine: function(increment){
+  incrementLine: function(increment) {
     this.lineno += increment;
     if (increment) this.colno = 1;
   },
@@ -158,8 +170,8 @@ Lexer.prototype = {
    * @api private
    */
 
-  incrementColumn: function(increment){
-    this.colno += increment
+  incrementColumn: function(increment) {
+    this.colno += increment;
   },
 
   /**
@@ -169,7 +181,7 @@ Lexer.prototype = {
    * @api private
    */
 
-  consume: function(len){
+  consume: function(len) {
     this.input = this.input.substr(len);
   },
 
@@ -182,9 +194,9 @@ Lexer.prototype = {
    * @api private
    */
 
-  scan: function(regexp, type){
+  scan: function(regexp, type) {
     var captures;
-    if (captures = regexp.exec(this.input)) {
+    if ((captures = regexp.exec(this.input))) {
       var len = captures[0].length;
       var val = captures[1];
       var diff = len - (val ? val.length : 0);
@@ -194,13 +206,13 @@ Lexer.prototype = {
       return tok;
     }
   },
-  scanEndOfLine: function (regexp, type) {
+  scanEndOfLine: function(regexp, type) {
     var captures;
-    if (captures = regexp.exec(this.input)) {
+    if ((captures = regexp.exec(this.input))) {
       var whitespaceLength = 0;
       var whitespace;
       var tok;
-      if (whitespace = /^([ ]+)([^ ]*)/.exec(captures[0])) {
+      if ((whitespace = /^([ ]+)([^ ]*)/.exec(captures[0]))) {
         whitespaceLength = whitespace[1].length;
         this.incrementColumn(whitespaceLength);
       }
@@ -230,11 +242,13 @@ Lexer.prototype = {
    * @api private
    */
 
-  bracketExpression: function(skip){
+  bracketExpression: function(skip) {
     skip = skip || 0;
     var start = this.input[skip];
-    assert(start === '(' || start === '{' || start === '[',
-           'The start character should be "(", "{" or "["');
+    assert(
+      start === '(' || start === '{' || start === '[',
+      'The start character should be "(", "{" or "["'
+    );
     var end = characterParser.BRACKETS[start];
     var range;
     try {
@@ -252,12 +266,17 @@ Lexer.prototype = {
           idx -= nextNewline + 1;
           ptr += nextNewline + 1;
           tmp = nextNewline = this.input.substr(ptr).indexOf('\n');
-        };
+        }
 
         this.incrementColumn(idx);
       }
       if (ex.code === 'CHARACTER_PARSER:END_OF_STRING_REACHED') {
-        this.error('NO_END_BRACKET', 'The end of the string reached with no closing bracket ' + end + ' found.');
+        this.error(
+          'NO_END_BRACKET',
+          'The end of the string reached with no closing bracket ' +
+            end +
+            ' found.'
+        );
       } else if (ex.code === 'CHARACTER_PARSER:MISMATCHED_BRACKET') {
         this.error('BRACKET_MISMATCH', ex.message);
       }
@@ -272,7 +291,7 @@ Lexer.prototype = {
     // established regexp
     if (this.indentRe) {
       captures = this.indentRe.exec(this.input);
-    // determine regexp
+      // determine regexp
     } else {
       // tabs
       re = /^\n(\t*) */;
@@ -298,7 +317,10 @@ Lexer.prototype = {
   eos: function() {
     if (this.input.length) return;
     if (this.interpolated) {
-      this.error('NO_END_BRACKET', 'End of line was reached with no closing bracket for interpolation.');
+      this.error(
+        'NO_END_BRACKET',
+        'End of line was reached with no closing bracket for interpolation.'
+      );
     }
     for (var i = 0; this.indentStack[i]; i++) {
       this.tokens.push(this.tokEnd(this.tok('outdent')));
@@ -314,7 +336,7 @@ Lexer.prototype = {
 
   blank: function() {
     var captures;
-    if (captures = /^\n[ \t]*\n/.exec(this.input)) {
+    if ((captures = /^\n[ \t]*\n/.exec(this.input))) {
       this.consume(captures[0].length - 1);
       this.incrementLine(1);
       return true;
@@ -327,7 +349,7 @@ Lexer.prototype = {
 
   comment: function() {
     var captures;
-    if (captures = /^\/\/(-)?([^\n]*)/.exec(this.input)) {
+    if ((captures = /^\/\/(-)?([^\n]*)/.exec(this.input))) {
       this.consume(captures[0].length);
       var tok = this.tok('comment', captures[2]);
       tok.buffer = '-' != captures[1];
@@ -369,8 +391,10 @@ Lexer.prototype = {
   tag: function() {
     var captures;
 
-    if (captures = /^(\w(?:[-:\w]*\w)?)/.exec(this.input)) {
-      var tok, name = captures[1], len = captures[0].length;
+    if ((captures = /^(\w(?:[-:\w]*\w)?)/.exec(this.input))) {
+      var tok,
+        name = captures[1],
+        len = captures[0].length;
       this.consume(len);
       tok = this.tok('tag', name);
       this.tokens.push(tok);
@@ -425,7 +449,12 @@ Lexer.prototype = {
       return true;
     }
     if (/^#/.test(this.input)) {
-      this.error('INVALID_ID', '"' + /.[^ \t\(\#\.\:]*/.exec(this.input.substr(1))[0] + '" is not a valid ID.');
+      this.error(
+        'INVALID_ID',
+        '"' +
+          /.[^ \t\(\#\.\:]*/.exec(this.input.substr(1))[0] +
+          '" is not a valid ID.'
+      );
     }
   },
 
@@ -442,24 +471,32 @@ Lexer.prototype = {
       return true;
     }
     if (/^\.[_a-z0-9\-]+/i.test(this.input)) {
-      this.error('INVALID_CLASS_NAME', 'Class names must contain at least one letter or underscore.');
+      this.error(
+        'INVALID_CLASS_NAME',
+        'Class names must contain at least one letter or underscore.'
+      );
     }
     if (/^\./.test(this.input)) {
-      this.error('INVALID_CLASS_NAME', '"' + /.[^ \t\(\#\.\:]*/.exec(this.input.substr(1))[0] + '" is not a valid class name.  Class names can only contain "_", "-", a-z and 0-9, and must contain at least one of "_", or a-z');
+      this.error(
+        'INVALID_CLASS_NAME',
+        '"' +
+          /.[^ \t\(\#\.\:]*/.exec(this.input.substr(1))[0] +
+          '" is not a valid class name.  Class names can only contain "_", "-", a-z and 0-9, and must contain at least one of "_", or a-z'
+      );
     }
   },
 
   /**
    * Text.
    */
-  endInterpolation: function () {
+  endInterpolation: function() {
     if (this.interpolated && this.input[0] === ']') {
       this.input = this.input.substr(1);
       this.ended = true;
       return true;
     }
   },
-  addText: function (type, value, prefix, escaped) {
+  addText: function(type, value, prefix, escaped) {
     var tok;
     if (value + prefix === '') return;
     prefix = prefix || '';
@@ -468,17 +505,35 @@ Lexer.prototype = {
     var indexOfStart = this.interpolationAllowed ? value.indexOf('#[') : -1;
     var indexOfEscaped = this.interpolationAllowed ? value.indexOf('\\#[') : -1;
     var matchOfStringInterp = /(\\)?([#!]){((?:.|\n)*)$/.exec(value);
-    var indexOfStringInterp = this.interpolationAllowed && matchOfStringInterp ? matchOfStringInterp.index : Infinity;
+    var indexOfStringInterp =
+      this.interpolationAllowed && matchOfStringInterp
+        ? matchOfStringInterp.index
+        : Infinity;
 
     if (indexOfEnd === -1) indexOfEnd = Infinity;
     if (indexOfStart === -1) indexOfStart = Infinity;
     if (indexOfEscaped === -1) indexOfEscaped = Infinity;
 
-    if (indexOfEscaped !== Infinity && indexOfEscaped < indexOfEnd && indexOfEscaped < indexOfStart && indexOfEscaped < indexOfStringInterp) {
+    if (
+      indexOfEscaped !== Infinity &&
+      indexOfEscaped < indexOfEnd &&
+      indexOfEscaped < indexOfStart &&
+      indexOfEscaped < indexOfStringInterp
+    ) {
       prefix = prefix + value.substring(0, indexOfEscaped) + '#[';
-      return this.addText(type, value.substring(indexOfEscaped + 3), prefix, escaped + 1);
+      return this.addText(
+        type,
+        value.substring(indexOfEscaped + 3),
+        prefix,
+        escaped + 1
+      );
     }
-    if (indexOfStart !== Infinity && indexOfStart < indexOfEnd && indexOfStart < indexOfEscaped && indexOfStart < indexOfStringInterp) {
+    if (
+      indexOfStart !== Infinity &&
+      indexOfStart < indexOfEnd &&
+      indexOfStart < indexOfEscaped &&
+      indexOfStart < indexOfStringInterp
+    ) {
       tok = this.tok(type, prefix + value.substring(0, indexOfStart));
       this.incrementColumn(prefix.length + indexOfStart + escaped);
       this.tokens.push(this.tokEnd(tok));
@@ -489,7 +544,7 @@ Lexer.prototype = {
         filename: this.filename,
         interpolated: true,
         startingLine: this.lineno,
-        startingColumn: this.colno
+        startingColumn: this.colno,
       });
       var interpolated;
       try {
@@ -509,7 +564,12 @@ Lexer.prototype = {
       this.addText(type, child.input);
       return;
     }
-    if (indexOfEnd !== Infinity && indexOfEnd < indexOfStart && indexOfEnd < indexOfEscaped && indexOfEnd < indexOfStringInterp) {
+    if (
+      indexOfEnd !== Infinity &&
+      indexOfEnd < indexOfStart &&
+      indexOfEnd < indexOfEscaped &&
+      indexOfEnd < indexOfStringInterp
+    ) {
       if (prefix + value.substring(0, indexOfEnd)) {
         this.addText(type, value.substring(0, indexOfEnd), prefix);
       }
@@ -520,7 +580,12 @@ Lexer.prototype = {
     if (indexOfStringInterp !== Infinity) {
       if (matchOfStringInterp[1]) {
         prefix = prefix + value.substring(0, indexOfStringInterp) + '#{';
-        return this.addText(type, value.substring(indexOfStringInterp + 3), prefix, escaped + 1);
+        return this.addText(
+          type,
+          value.substring(indexOfStringInterp + 3),
+          prefix,
+          escaped + 1
+        );
       }
       var before = value.substr(0, indexOfStringInterp);
       if (prefix || before) {
@@ -541,7 +606,10 @@ Lexer.prototype = {
           this.incrementColumn(ex.index);
         }
         if (ex.code === 'CHARACTER_PARSER:END_OF_STRING_REACHED') {
-          this.error('NO_END_BRACKET', 'End of line was reached with no closing bracket for interpolation.');
+          this.error(
+            'NO_END_BRACKET',
+            'End of line was reached with no closing bracket for interpolation.'
+          );
         } else if (ex.code === 'CHARACTER_PARSER:MISMATCHED_BRACKET') {
           this.error('BRACKET_MISMATCH', ex.message);
         } else {
@@ -572,7 +640,8 @@ Lexer.prototype = {
   },
 
   text: function() {
-    var tok = this.scan(/^(?:\| ?| )([^\n]+)/, 'text') ||
+    var tok =
+      this.scan(/^(?:\| ?| )([^\n]+)/, 'text') ||
       this.scan(/^( )/, 'text') ||
       this.scan(/^\|( ?)/, 'text');
     if (tok) {
@@ -581,7 +650,7 @@ Lexer.prototype = {
     }
   },
 
-  textHtml: function () {
+  textHtml: function() {
     var tok = this.scan(/^(<[^\n]*)/, 'text-html');
     if (tok) {
       this.addText('text-html', tok.val);
@@ -595,7 +664,7 @@ Lexer.prototype = {
 
   dot: function() {
     var tok;
-    if (tok = this.scanEndOfLine(/^\./, 'dot')) {
+    if ((tok = this.scanEndOfLine(/^\./, 'dot'))) {
       this.tokens.push(this.tokEnd(tok));
       this.callLexerFunction('pipelessText');
       return true;
@@ -606,7 +675,7 @@ Lexer.prototype = {
    * Extends.
    */
 
-  "extends": function() {
+  extends: function() {
     var tok = this.scan(/^extends?(?= |$|\n)/, 'extends');
     if (tok) {
       this.tokens.push(this.tokEnd(tok));
@@ -626,17 +695,22 @@ Lexer.prototype = {
 
   prepend: function() {
     var captures;
-    if (captures = /^(?:block +)?prepend +([^\n]+)/.exec(this.input)) {
+    if ((captures = /^(?:block +)?prepend +([^\n]+)/.exec(this.input))) {
       var name = captures[1].trim();
       var comment = '';
       if (name.indexOf('//') !== -1) {
-        comment = '//' + name.split('//').slice(1).join('//');
+        comment =
+          '//' +
+          name
+            .split('//')
+            .slice(1)
+            .join('//');
         name = name.split('//')[0].trim();
       }
       if (!name) return;
       var tok = this.tok('block', name);
       var len = captures[0].length - comment.length;
-      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      while (this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
       this.incrementColumn(len);
       tok.mode = 'prepend';
       this.tokens.push(this.tokEnd(tok));
@@ -652,17 +726,22 @@ Lexer.prototype = {
 
   append: function() {
     var captures;
-    if (captures = /^(?:block +)?append +([^\n]+)/.exec(this.input)) {
+    if ((captures = /^(?:block +)?append +([^\n]+)/.exec(this.input))) {
       var name = captures[1].trim();
       var comment = '';
       if (name.indexOf('//') !== -1) {
-        comment = '//' + name.split('//').slice(1).join('//');
+        comment =
+          '//' +
+          name
+            .split('//')
+            .slice(1)
+            .join('//');
         name = name.split('//')[0].trim();
       }
       if (!name) return;
       var tok = this.tok('block', name);
       var len = captures[0].length - comment.length;
-      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      while (this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
       this.incrementColumn(len);
       tok.mode = 'append';
       this.tokens.push(this.tokEnd(tok));
@@ -678,17 +757,22 @@ Lexer.prototype = {
 
   block: function() {
     var captures;
-    if (captures = /^block +([^\n]+)/.exec(this.input)) {
+    if ((captures = /^block +([^\n]+)/.exec(this.input))) {
       var name = captures[1].trim();
       var comment = '';
       if (name.indexOf('//') !== -1) {
-        comment = '//' + name.split('//').slice(1).join('//');
+        comment =
+          '//' +
+          name
+            .split('//')
+            .slice(1)
+            .join('//');
         name = name.split('//')[0].trim();
       }
       if (!name) return;
       var tok = this.tok('block', name);
       var len = captures[0].length - comment.length;
-      while(this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
+      while (this.whitespaceRe.test(this.input.charAt(len - 1))) len--;
       this.incrementColumn(len);
       tok.mode = 'replace';
       this.tokens.push(this.tokEnd(tok));
@@ -704,7 +788,7 @@ Lexer.prototype = {
 
   mixinBlock: function() {
     var tok;
-    if (tok = this.scanEndOfLine(/^block/, 'mixin-block')) {
+    if ((tok = this.scanEndOfLine(/^block/, 'mixin-block'))) {
       this.tokens.push(this.tokEnd(tok));
       return true;
     }
@@ -714,7 +798,7 @@ Lexer.prototype = {
    * Yield.
    */
 
-  'yield': function() {
+  yield: function() {
     var tok = this.scanEndOfLine(/^yield/, 'yield');
     if (tok) {
       this.tokens.push(this.tokEnd(tok));
@@ -730,7 +814,7 @@ Lexer.prototype = {
     var tok = this.scan(/^include(?=:| |$|\n)/, 'include');
     if (tok) {
       this.tokens.push(this.tokEnd(tok));
-      while (this.callLexerFunction('filter', { inInclude: true }));
+      while (this.callLexerFunction('filter', {inInclude: true}));
       if (!this.callLexerFunction('path')) {
         if (/^[^ \n]+/.test(this.input)) {
           // if there is more text
@@ -763,7 +847,7 @@ Lexer.prototype = {
    * Case.
    */
 
-  "case": function() {
+  case: function() {
     var tok = this.scanEndOfLine(/^case +([^\n]+)/, 'case');
     if (tok) {
       this.incrementColumn(-tok.val.length);
@@ -810,14 +894,17 @@ Lexer.prototype = {
    * Default.
    */
 
-  "default": function() {
+  default: function() {
     var tok = this.scanEndOfLine(/^default/, 'default');
     if (tok) {
       this.tokens.push(this.tokEnd(tok));
       return true;
     }
     if (this.scan(/^default\b/)) {
-      this.error('DEFAULT_WITH_EXPRESSION', 'default should not have an expression');
+      this.error(
+        'DEFAULT_WITH_EXPRESSION',
+        'default should not have an expression'
+      );
     }
   },
 
@@ -825,10 +912,9 @@ Lexer.prototype = {
    * Call mixin.
    */
 
-  call: function(){
-
+  call: function() {
     var tok, captures, increment;
-    if (captures = /^\+(\s*)(([-\w]+)|(#\{))/.exec(this.input)) {
+    if ((captures = /^\+(\s*)(([-\w]+)|(#\{))/.exec(this.input))) {
       // try to consume simple or interpolated call
       if (captures[3]) {
         // simple call
@@ -841,16 +927,17 @@ Lexer.prototype = {
         increment = match.end + 1;
         this.consume(increment);
         this.assertExpression(match.src);
-        tok = this.tok('call', '#{'+match.src+'}');
+        tok = this.tok('call', '#{' + match.src + '}');
       }
 
       this.incrementColumn(increment);
 
       tok.args = null;
       // Check for args (not attributes)
-      if (captures = /^ *\(/.exec(this.input)) {
+      if ((captures = /^ *\(/.exec(this.input))) {
         var range = this.bracketExpression(captures[0].length - 1);
-        if (!/^\s*[-\w]+ *=/.test(range.src)) { // not attributes
+        if (!/^\s*[-\w]+ *=/.test(range.src)) {
+          // not attributes
           this.incrementColumn(1);
           this.consume(range.end + 1);
           tok.args = range.src;
@@ -873,9 +960,9 @@ Lexer.prototype = {
    * Mixin.
    */
 
-  mixin: function(){
+  mixin: function() {
     var captures;
-    if (captures = /^mixin +([-\w]+)(?: *\((.*)\))? */.exec(this.input)) {
+    if ((captures = /^mixin +([-\w]+)(?: *\((.*)\))? */.exec(this.input))) {
       this.consume(captures[0].length);
       var tok = this.tok('mixin', captures[1]);
       tok.args = captures[2] || null;
@@ -891,7 +978,7 @@ Lexer.prototype = {
 
   conditional: function() {
     var captures;
-    if (captures = /^(if|unless|else if|else)\b([^\n]*)/.exec(this.input)) {
+    if ((captures = /^(if|unless|else if|else)\b([^\n]*)/.exec(this.input))) {
       this.consume(captures[0].length);
       var type = captures[1].replace(/ /g, '-');
       var js = captures[2] && captures[2].trim();
@@ -928,9 +1015,9 @@ Lexer.prototype = {
    * While.
    */
 
-  "while": function() {
+  while: function() {
     var captures, tok;
-    if (captures = /^while +([^\n]+)/.exec(this.input)) {
+    if ((captures = /^while +([^\n]+)/.exec(this.input))) {
       this.consume(captures[0].length);
       this.assertExpression(captures[1]);
       tok = this.tok('while', captures[1]);
@@ -949,12 +1036,16 @@ Lexer.prototype = {
 
   each: function() {
     var captures;
-    if (captures = /^(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? * in *([^\n]+)/.exec(this.input)) {
+    if (
+      (captures = /^(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? * in *([^\n]+)/.exec(
+        this.input
+      ))
+    ) {
       this.consume(captures[0].length);
       var tok = this.tok('each', captures[1]);
       tok.key = captures[2] || null;
       this.incrementColumn(captures[0].length - captures[3].length);
-      this.assertExpression(captures[3])
+      this.assertExpression(captures[3]);
       tok.code = captures[3];
       this.incrementColumn(captures[3].length);
       this.tokens.push(this.tokEnd(tok));
@@ -963,7 +1054,11 @@ Lexer.prototype = {
     if (this.scan(/^(?:each|for)\b/)) {
       this.error('MALFORMED_EACH', 'malformed each');
     }
-    if (captures = /^- *(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? +in +([^\n]+)/.exec(this.input)) {
+    if (
+      (captures = /^- *(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? +in +([^\n]+)/.exec(
+        this.input
+      ))
+    ) {
       this.error(
         'MALFORMED_EACH',
         'Pug each and for should no longer be prefixed with a dash ("-"). They are pug keywords and not part of JavaScript.'
@@ -977,26 +1072,37 @@ Lexer.prototype = {
 
   eachOf: function() {
     var captures;
-    if (captures = /^(?:each|for) (.*) of *([^\n]+)/.exec(this.input)) {
+    if ((captures = /^(?:each|for) (.*) of *([^\n]+)/.exec(this.input))) {
       this.consume(captures[0].length);
       var tok = this.tok('eachOf', captures[1]);
       tok.value = captures[1];
       this.incrementColumn(captures[0].length - captures[2].length);
-      this.assertExpression(captures[2])
+      this.assertExpression(captures[2]);
       tok.code = captures[2];
       this.incrementColumn(captures[2].length);
       this.tokens.push(this.tokEnd(tok));
 
-      if (!(/^[a-zA-Z_$][\w$]*$/.test(tok.value.trim()) || /^\[ *[a-zA-Z_$][\w$]* *\, *[a-zA-Z_$][\w$]* *\]$/.test(tok.value.trim()))) {
+      if (
+        !(
+          /^[a-zA-Z_$][\w$]*$/.test(tok.value.trim()) ||
+          /^\[ *[a-zA-Z_$][\w$]* *\, *[a-zA-Z_$][\w$]* *\]$/.test(
+            tok.value.trim()
+          )
+        )
+      ) {
         this.error(
           'MALFORMED_EACH_OF_LVAL',
           'The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).'
         );
       }
-      
+
       return true;
     }
-    if (captures = /^- *(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? +of +([^\n]+)/.exec(this.input)) {
+    if (
+      (captures = /^- *(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? +of +([^\n]+)/.exec(
+        this.input
+      ))
+    ) {
       this.error(
         'MALFORMED_EACH',
         'Pug each and for should not be prefixed with a dash ("-"). They are pug keywords and not part of JavaScript.'
@@ -1010,7 +1116,7 @@ Lexer.prototype = {
 
   code: function() {
     var captures;
-    if (captures = /^(!?=|-)[ \t]*([^\n]+)/.exec(this.input)) {
+    if ((captures = /^(!?=|-)[ \t]*([^\n]+)/.exec(this.input))) {
       var flags = captures[1];
       var code = captures[2];
       var shortened = 0;
@@ -1023,7 +1129,10 @@ Lexer.prototype = {
             this.incrementColumn(captures[0].length - code.length + err.index);
           }
           if (err.code === 'CHARACTER_PARSER:END_OF_STRING_REACHED') {
-            this.error('NO_END_BRACKET', 'End of line was reached with no closing bracket for interpolation.');
+            this.error(
+              'NO_END_BRACKET',
+              'End of line was reached with no closing bracket for interpolation.'
+            );
           } else if (err.code === 'CHARACTER_PARSER:MISMATCHED_BRACKET') {
             this.error('BRACKET_MISMATCH', err.message);
           } else {
@@ -1077,75 +1186,79 @@ Lexer.prototype = {
    * Block code.
    */
   blockCode: function() {
-    var tok
-    if (tok = this.scanEndOfLine(/^-/, 'blockcode')) {
+    var tok;
+    if ((tok = this.scanEndOfLine(/^-/, 'blockcode'))) {
       this.tokens.push(this.tokEnd(tok));
       this.interpolationAllowed = false;
       this.callLexerFunction('pipelessText');
       return true;
     }
   },
-  
+
   /**
    * Attribute Name.
    */
-  attribute: function(str){
+  attribute: function(str) {
     var quote = '';
     var quoteRe = /['"]/;
     var key = '';
     var i;
-    
+
     // consume all whitespace before the key
-    for(i = 0; i < str.length; i++){
-      if(!this.whitespaceRe.test(str[i])) break;
-      if(str[i] === '\n'){
+    for (i = 0; i < str.length; i++) {
+      if (!this.whitespaceRe.test(str[i])) break;
+      if (str[i] === '\n') {
         this.incrementLine(1);
       } else {
         this.incrementColumn(1);
       }
     }
-    
-    if(i === str.length){
+
+    if (i === str.length) {
       return '';
     }
-    
+
     var tok = this.tok('attribute');
-    
+
     // quote?
-    if(quoteRe.test(str[i])){
+    if (quoteRe.test(str[i])) {
       quote = str[i];
       this.incrementColumn(1);
       i++;
     }
-    
+
     // start looping through the key
     for (; i < str.length; i++) {
-      
-      if(quote){
+      if (quote) {
         if (str[i] === quote) {
           this.incrementColumn(1);
           i++;
           break;
         }
       } else {
-        if(this.whitespaceRe.test(str[i]) || str[i] === '!' || str[i] === '=' || str[i] === ',') {
+        if (
+          this.whitespaceRe.test(str[i]) ||
+          str[i] === '!' ||
+          str[i] === '=' ||
+          str[i] === ','
+        ) {
           break;
         }
       }
-      
+
       key += str[i];
-        
+
       if (str[i] === '\n') {
         this.incrementLine(1);
       } else {
         this.incrementColumn(1);
       }
     }
-    
+
     tok.name = key;
-    
+
     var valueResponse = this.attributeValue(str.substr(i));
-    
+
     if (valueResponse.val) {
       tok.val = valueResponse.val;
       tok.mustEscape = valueResponse.mustEscape;
@@ -1154,34 +1267,34 @@ Lexer.prototype = {
       tok.val = true;
       tok.mustEscape = true;
     }
-    
+
     str = valueResponse.remainingSource;
-    
+
     this.tokens.push(this.tokEnd(tok));
-    
-    for(i = 0; i < str.length; i++){
-      if(!this.whitespaceRe.test(str[i])) {
+
+    for (i = 0; i < str.length; i++) {
+      if (!this.whitespaceRe.test(str[i])) {
         break;
       }
-      if(str[i] === '\n'){
+      if (str[i] === '\n') {
         this.incrementLine(1);
       } else {
         this.incrementColumn(1);
       }
     }
-    
-    if(str[i] === ','){
+
+    if (str[i] === ',') {
       this.incrementColumn(1);
       i++;
     }
-    
+
     return str.substr(i);
   },
-  
+
   /**
    * Attribute Value.
    */
-  attributeValue: function(str){
+  attributeValue: function(str) {
     var quoteRe = /['"]/;
     var val = '';
     var done, i, x;
@@ -1189,96 +1302,106 @@ Lexer.prototype = {
     var state = characterParser.defaultState();
     var col = this.colno;
     var line = this.lineno;
-    
+
     // consume all whitespace before the equals sign
-    for(i = 0; i < str.length; i++){
-      if(!this.whitespaceRe.test(str[i])) break;
-      if(str[i] === '\n'){
+    for (i = 0; i < str.length; i++) {
+      if (!this.whitespaceRe.test(str[i])) break;
+      if (str[i] === '\n') {
         line++;
         col = 1;
       } else {
         col++;
       }
     }
-    
-    if(i === str.length){
-      return { remainingSource: str };
+
+    if (i === str.length) {
+      return {remainingSource: str};
     }
-    
-    if(str[i] === '!'){
+
+    if (str[i] === '!') {
       escapeAttr = false;
       col++;
       i++;
-      if (str[i] !== '=') this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[i] + ' expected `=`');
+      if (str[i] !== '=')
+        this.error(
+          'INVALID_KEY_CHARACTER',
+          'Unexpected character ' + str[i] + ' expected `=`'
+        );
     }
-    
-    if(str[i] !== '='){
+
+    if (str[i] !== '=') {
       // check for anti-pattern `div("foo"bar)`
-      if (i === 0 && str && !this.whitespaceRe.test(str[0]) && str[0] !== ','){
-        this.error('INVALID_KEY_CHARACTER', 'Unexpected character ' + str[0] + ' expected `=`');
+      if (i === 0 && str && !this.whitespaceRe.test(str[0]) && str[0] !== ',') {
+        this.error(
+          'INVALID_KEY_CHARACTER',
+          'Unexpected character ' + str[0] + ' expected `=`'
+        );
       } else {
-        return { remainingSource: str };
+        return {remainingSource: str};
       }
     }
-    
+
     this.lineno = line;
     this.colno = col + 1;
     i++;
-    
+
     // consume all whitespace before the value
-    for(; i < str.length; i++){
-      if(!this.whitespaceRe.test(str[i])) break;
-      if(str[i] === '\n'){
+    for (; i < str.length; i++) {
+      if (!this.whitespaceRe.test(str[i])) break;
+      if (str[i] === '\n') {
         this.incrementLine(1);
       } else {
         this.incrementColumn(1);
       }
     }
-    
+
     line = this.lineno;
     col = this.colno;
-    
+
     // start looping through the value
     for (; i < str.length; i++) {
       // if the character is in a string or in parentheses/brackets/braces
-      if (!(state.isNesting() || state.isString())){
-        
+      if (!(state.isNesting() || state.isString())) {
         if (this.whitespaceRe.test(str[i])) {
           done = false;
-          
+
           // find the first non-whitespace character
           for (x = i; x < str.length; x++) {
             if (!this.whitespaceRe.test(str[x])) {
               // if it is a JavaScript punctuator, then assume that it is
               // a part of the value
-              const isNotPunctuator = !characterParser.isPunctuator(str[x])
-              const isQuote = quoteRe.test(str[x])
-              const isColon = str[x] === ':'
-              const isSpreadOperator = str[x] + str[x + 1] + str[x + 2] === '...'
-              if ((isNotPunctuator || isQuote || isColon || isSpreadOperator) && this.assertExpression(val, true)) {
+              const isNotPunctuator = !characterParser.isPunctuator(str[x]);
+              const isQuote = quoteRe.test(str[x]);
+              const isColon = str[x] === ':';
+              const isSpreadOperator =
+                str[x] + str[x + 1] + str[x + 2] === '...';
+              if (
+                (isNotPunctuator || isQuote || isColon || isSpreadOperator) &&
+                this.assertExpression(val, true)
+              ) {
                 done = true;
               }
               break;
             }
           }
-          
+
           // if everything else is whitespace, return now so last attribute
           // does not include trailing whitespace
-          if(done || x === str.length){
+          if (done || x === str.length) {
             break;
           }
         }
-        
+
         // if there's no whitespace and the character is not ',', the
         // attribute did not end.
-        if(str[i] === ',' && this.assertExpression(val, true)){
+        if (str[i] === ',' && this.assertExpression(val, true)) {
           break;
         }
       }
-      
+
       state = characterParser.parseChar(str[i], state);
       val += str[i];
-      
+
       if (str[i] === '\n') {
         line++;
         col = 1;
@@ -1286,33 +1409,33 @@ Lexer.prototype = {
         col++;
       }
     }
-    
+
     this.assertExpression(val);
-    
+
     this.lineno = line;
     this.colno = col;
-    
-    return { val: val, mustEscape: escapeAttr, remainingSource: str.substr(i) };
+
+    return {val: val, mustEscape: escapeAttr, remainingSource: str.substr(i)};
   },
 
   /**
    * Attributes.
    */
-  
+
   attrs: function() {
     var tok;
-    
+
     if ('(' == this.input.charAt(0)) {
       tok = this.tok('start-attributes');
       var index = this.bracketExpression().end;
-      var str = this.input.substr(1, index-1);
+      var str = this.input.substr(1, index - 1);
 
       this.incrementColumn(1);
       this.tokens.push(this.tokEnd(tok));
       this.assertNestingCorrect(str);
       this.consume(index + 1);
 
-      while(str){
+      while (str) {
         str = this.attribute(str);
       }
 
@@ -1326,7 +1449,7 @@ Lexer.prototype = {
   /**
    * &attributes block
    */
-  attributesBlock: function () {
+  attributesBlock: function() {
     if (/^&attributes\b/.test(this.input)) {
       var consumed = 11;
       this.consume(consumed);
@@ -1357,7 +1480,10 @@ Lexer.prototype = {
       this.consume(indents + 1);
 
       if (' ' == this.input[0] || '\t' == this.input[0]) {
-        this.error('INVALID_INDENTATION', 'Invalid indentation, you can use tabs or spaces but not both');
+        this.error(
+          'INVALID_INDENTATION',
+          'Invalid indentation, you can use tabs or spaces but not both'
+        );
       }
 
       // blank line
@@ -1371,24 +1497,31 @@ Lexer.prototype = {
         var outdent_count = 0;
         while (this.indentStack[0] > indents) {
           if (this.indentStack[1] < indents) {
-            this.error('INCONSISTENT_INDENTATION', 'Inconsistent indentation. Expecting either ' + this.indentStack[1] + ' or ' + this.indentStack[0] + ' spaces/tabs.');
+            this.error(
+              'INCONSISTENT_INDENTATION',
+              'Inconsistent indentation. Expecting either ' +
+                this.indentStack[1] +
+                ' or ' +
+                this.indentStack[0] +
+                ' spaces/tabs.'
+            );
           }
           outdent_count++;
           this.indentStack.shift();
         }
-        while(outdent_count--){
+        while (outdent_count--) {
           this.colno = 1;
           tok = this.tok('outdent');
           this.colno = this.indentStack[0] + 1;
           this.tokens.push(this.tokEnd(tok));
         }
-      // indent
+        // indent
       } else if (indents && indents != this.indentStack[0]) {
         tok = this.tok('indent', indents);
         this.colno = 1 + indents;
         this.tokens.push(this.tokEnd(tok));
         this.indentStack.unshift(indents);
-      // newline
+        // newline
       } else {
         tok = this.tok('newline');
         this.colno = 1 + Math.min(this.indentStack[0] || 0, indents);
@@ -1405,7 +1538,7 @@ Lexer.prototype = {
 
     var captures = this.scanIndentation();
 
-    indents = indents || captures && captures[1].length;
+    indents = indents || (captures && captures[1].length);
     if (indents > this.indentStack[0]) {
       this.tokens.push(this.tokEnd(this.tok('start-pipeless-text')));
       var tokens = [];
@@ -1434,17 +1567,20 @@ Lexer.prototype = {
           this.tokens.pop();
           return pipelessText.call(this, lineCaptures[1].length);
         }
-      } while((this.input.length - stringPtr) && isMatch);
+      } while (this.input.length - stringPtr && isMatch);
       this.consume(stringPtr);
-      while (this.input.length === 0 && tokens[tokens.length - 1] === '') tokens.pop();
-      tokens.forEach(function (token, i) {
-        var tok;
-        this.incrementLine(1);
-        if (i !== 0) tok = this.tok('newline');
-        if (token_indent[i]) this.incrementColumn(indents);
-        if (tok) this.tokens.push(this.tokEnd(tok));
-        this.addText('text', token);
-      }.bind(this));
+      while (this.input.length === 0 && tokens[tokens.length - 1] === '')
+        tokens.pop();
+      tokens.forEach(
+        function(token, i) {
+          var tok;
+          this.incrementLine(1);
+          if (i !== 0) tok = this.tok('newline');
+          if (token_indent[i]) this.incrementColumn(indents);
+          if (tok) this.tokens.push(this.tokEnd(tok));
+          this.addText('text', token);
+        }.bind(this)
+      );
       this.tokens.push(this.tokEnd(this.tok('end-pipeless-text')));
       return true;
     }
@@ -1474,11 +1610,14 @@ Lexer.prototype = {
     }
   },
 
-  fail: function () {
-    this.error('UNEXPECTED_TEXT', 'unexpected text "' + this.input.substr(0, 5) + '"');
+  fail: function() {
+    this.error(
+      'UNEXPECTED_TEXT',
+      'unexpected text "' + this.input.substr(0, 5) + '"'
+    );
   },
 
-  callLexerFunction: function (func) {
+  callLexerFunction: function(func) {
     var rest = [];
     for (var i = 1; i < arguments.length; i++) {
       rest.push(arguments[i]);
@@ -1500,43 +1639,45 @@ Lexer.prototype = {
    */
 
   advance: function() {
-    return this.callLexerFunction('blank')
-      || this.callLexerFunction('eos')
-      || this.callLexerFunction('endInterpolation')
-      || this.callLexerFunction('yield')
-      || this.callLexerFunction('doctype')
-      || this.callLexerFunction('interpolation')
-      || this.callLexerFunction('case')
-      || this.callLexerFunction('when')
-      || this.callLexerFunction('default')
-      || this.callLexerFunction('extends')
-      || this.callLexerFunction('append')
-      || this.callLexerFunction('prepend')
-      || this.callLexerFunction('block')
-      || this.callLexerFunction('mixinBlock')
-      || this.callLexerFunction('include')
-      || this.callLexerFunction('mixin')
-      || this.callLexerFunction('call')
-      || this.callLexerFunction('conditional')
-      || this.callLexerFunction('eachOf')
-      || this.callLexerFunction('each')
-      || this.callLexerFunction('while')
-      || this.callLexerFunction('tag')
-      || this.callLexerFunction('filter')
-      || this.callLexerFunction('blockCode')
-      || this.callLexerFunction('code')
-      || this.callLexerFunction('id')
-      || this.callLexerFunction('dot')
-      || this.callLexerFunction('className')
-      || this.callLexerFunction('attrs')
-      || this.callLexerFunction('attributesBlock')
-      || this.callLexerFunction('indent')
-      || this.callLexerFunction('text')
-      || this.callLexerFunction('textHtml')
-      || this.callLexerFunction('comment')
-      || this.callLexerFunction('slash')
-      || this.callLexerFunction('colon')
-      || this.fail();
+    return (
+      this.callLexerFunction('blank') ||
+      this.callLexerFunction('eos') ||
+      this.callLexerFunction('endInterpolation') ||
+      this.callLexerFunction('yield') ||
+      this.callLexerFunction('doctype') ||
+      this.callLexerFunction('interpolation') ||
+      this.callLexerFunction('case') ||
+      this.callLexerFunction('when') ||
+      this.callLexerFunction('default') ||
+      this.callLexerFunction('extends') ||
+      this.callLexerFunction('append') ||
+      this.callLexerFunction('prepend') ||
+      this.callLexerFunction('block') ||
+      this.callLexerFunction('mixinBlock') ||
+      this.callLexerFunction('include') ||
+      this.callLexerFunction('mixin') ||
+      this.callLexerFunction('call') ||
+      this.callLexerFunction('conditional') ||
+      this.callLexerFunction('eachOf') ||
+      this.callLexerFunction('each') ||
+      this.callLexerFunction('while') ||
+      this.callLexerFunction('tag') ||
+      this.callLexerFunction('filter') ||
+      this.callLexerFunction('blockCode') ||
+      this.callLexerFunction('code') ||
+      this.callLexerFunction('id') ||
+      this.callLexerFunction('dot') ||
+      this.callLexerFunction('className') ||
+      this.callLexerFunction('attrs') ||
+      this.callLexerFunction('attributesBlock') ||
+      this.callLexerFunction('indent') ||
+      this.callLexerFunction('text') ||
+      this.callLexerFunction('textHtml') ||
+      this.callLexerFunction('comment') ||
+      this.callLexerFunction('slash') ||
+      this.callLexerFunction('colon') ||
+      this.fail()
+    );
   },
 
   /**
@@ -1545,10 +1686,10 @@ Lexer.prototype = {
    * @returns {Array.<Token>}
    * @api public
    */
-  getTokens: function () {
+  getTokens: function() {
     while (!this.ended) {
       this.callLexerFunction('advance');
     }
     return this.tokens;
-  }
+  },
 };
diff --git a/packages/pug-lexer/test/cases/javascript-new-lines.js b/packages/pug-lexer/test/cases/javascript-new-lines.js
index 6893341c5..bb0c26f05 100644
--- a/packages/pug-lexer/test/cases/javascript-new-lines.js
+++ b/packages/pug-lexer/test/cases/javascript-new-lines.js
@@ -1 +1 @@
-var x = "\n here is some \n new lined text";
+var x = '\n here is some \n new lined text';
diff --git a/packages/pug-lexer/test/check-lexer-functions.test.js b/packages/pug-lexer/test/check-lexer-functions.test.js
index 49ec401e1..361212884 100644
--- a/packages/pug-lexer/test/check-lexer-functions.test.js
+++ b/packages/pug-lexer/test/check-lexer-functions.test.js
@@ -47,7 +47,7 @@ var lexerFunctions = {
   yield: true,
 };
 
-function checkDirectCalls (node) {
+function checkDirectCalls(node) {
   var callee = node.callee;
   if (callee.type !== 'MemberExpression') return;
   if (callee.object.type !== 'ThisExpression') return;
@@ -60,11 +60,19 @@ function checkDirectCalls (node) {
     func = property.name;
   }
   if (!lexerFunctions[func]) return;
-  console.log('index.js:' + node.loc.start.line + ':' + node.loc.start.column + ': Lexer function ' + func + ' called directly');
+  console.log(
+    'index.js:' +
+      node.loc.start.line +
+      ':' +
+      node.loc.start.column +
+      ': Lexer function ' +
+      func +
+      ' called directly'
+  );
   hadErrors = true;
 }
 
-function checkMissingLexerFunction (node) {
+function checkMissingLexerFunction(node) {
   var callee = node.callee;
   if (callee.type !== 'MemberExpression') return;
   if (callee.object.type !== 'ThisExpression') return;
@@ -81,17 +89,25 @@ function checkMissingLexerFunction (node) {
   if (node.arguments[0].type !== 'Literal') return;
   func = node.arguments[0].value;
   if (lexerFunctions[func]) return;
-  console.log('index.js:' + node.loc.start.line + ':' + node.loc.start.column + ': Lexer function ' + func + ' not in lexerFunctions list');
+  console.log(
+    'index.js:' +
+      node.loc.start.line +
+      ':' +
+      node.loc.start.column +
+      ': Lexer function ' +
+      func +
+      ' not in lexerFunctions list'
+  );
   hadErrors = true;
 }
 test('lexer functions', () => {
   var str = fs.readFileSync(__dirname + '/../index.js', 'utf8');
   var ast = acorn.parse(str, {locations: true});
   walk.simple(ast, {
-    CallExpression: function (node) {
+    CallExpression: function(node) {
       checkDirectCalls(node);
       checkMissingLexerFunction(node);
-    }
+    },
   });
   if (hadErrors) {
     throw new Error('Problem with lexer functions detected');
diff --git a/packages/pug-lexer/test/index.test.js b/packages/pug-lexer/test/index.test.js
index 19412c19f..385a32b11 100644
--- a/packages/pug-lexer/test/index.test.js
+++ b/packages/pug-lexer/test/index.test.js
@@ -5,23 +5,26 @@ var assert = require('assert');
 var lex = require('../');
 
 var dir = __dirname + '/cases/';
-fs.readdirSync(dir).forEach(function (testCase) {
+fs.readdirSync(dir).forEach(function(testCase) {
   if (/\.pug$/.test(testCase)) {
     test(testCase, () => {
-      var result = lex(fs.readFileSync(dir + testCase, 'utf8'), {filename: dir + testCase});
+      var result = lex(fs.readFileSync(dir + testCase, 'utf8'), {
+        filename: dir + testCase,
+      });
       expect(result).toMatchSnapshot();
     });
   }
 });
 
-
 var edir = __dirname + '/errors/';
-fs.readdirSync(edir).forEach(function (testCase) {
+fs.readdirSync(edir).forEach(function(testCase) {
   if (/\.pug$/.test(testCase)) {
     test(testCase, () => {
       var actual;
       try {
-        lex(fs.readFileSync(edir + testCase, 'utf8'), {filename: edir + testCase});
+        lex(fs.readFileSync(edir + testCase, 'utf8'), {
+          filename: edir + testCase,
+        });
         throw new Error('Expected ' + testCase + ' to throw an exception.');
       } catch (ex) {
         if (!ex || !ex.code || ex.code.indexOf('PUG:') !== 0) throw ex;
@@ -29,7 +32,7 @@ fs.readdirSync(edir).forEach(function (testCase) {
           msg: ex.msg,
           code: ex.code,
           line: ex.line,
-          column: ex.column
+          column: ex.column,
         };
       }
       expect(actual).toMatchSnapshot();
diff --git a/packages/pug-linker/index.js b/packages/pug-linker/index.js
index e7993e8f2..256d74bb0 100644
--- a/packages/pug-linker/index.js
+++ b/packages/pug-linker/index.js
@@ -9,7 +9,10 @@ function error() {
 
 module.exports = link;
 function link(ast) {
-  assert(ast.type === 'Block', 'The top level element should always be a block');
+  assert(
+    ast.type === 'Block',
+    'The top level element should always be a block'
+  );
   var extendsNode = null;
   if (ast.nodes.length) {
     var hasExtends = ast.nodes[0].type === 'Extends';
@@ -31,18 +34,22 @@ function link(ast) {
       } else if (node.type === 'Mixin' && node.call === false) {
         mixins.push(node);
       } else {
-        error('UNEXPECTED_NODES_IN_EXTENDING_ROOT', 'Only named blocks and mixins can appear at the top level of an extending template', node);
+        error(
+          'UNEXPECTED_NODES_IN_EXTENDING_ROOT',
+          'Only named blocks and mixins can appear at the top level of an extending template',
+          node
+        );
       }
     });
     var parent = link(extendsNode.file.ast);
     extend(parent.declaredBlocks, ast);
     var foundBlockNames = [];
-    walk(parent, function (node) {
+    walk(parent, function(node) {
       if (node.type === 'NamedBlock') {
         foundBlockNames.push(node.name);
       }
     });
-    expectedBlocks.forEach(function (expectedBlock) {
+    expectedBlocks.forEach(function(expectedBlock) {
       if (foundBlockNames.indexOf(expectedBlock.name) === -1) {
         error(
           'UNEXPECTED_BLOCK',
@@ -51,7 +58,7 @@ function link(ast) {
         );
       }
     });
-    Object.keys(ast.declaredBlocks).forEach(function (name) {
+    Object.keys(ast.declaredBlocks).forEach(function(name) {
       parent.declaredBlocks[name] = ast.declaredBlocks[name];
     });
     parent.nodes = mixins.concat(parent.nodes);
@@ -74,7 +81,7 @@ function findDeclaredBlocks(ast) /*: {[name: string]: Array<BlockNode>}*/ {
 
 function flattenParentBlocks(parentBlocks, accumulator) {
   accumulator = accumulator || [];
-  parentBlocks.forEach(function (parentBlock) {
+  parentBlocks.forEach(function(parentBlock) {
     if (parentBlock.parents) {
       flattenParentBlocks(parentBlock.parents, accumulator);
     }
@@ -85,58 +92,68 @@ function flattenParentBlocks(parentBlocks, accumulator) {
 
 function extend(parentBlocks, ast) {
   var stack = {};
-  walk(ast, function before(node) {
-    if (node.type === 'NamedBlock') {
-      if (stack[node.name] === node.name) {
-        return node.ignore = true;
+  walk(
+    ast,
+    function before(node) {
+      if (node.type === 'NamedBlock') {
+        if (stack[node.name] === node.name) {
+          return (node.ignore = true);
+        }
+        stack[node.name] = node.name;
+        var parentBlockList = parentBlocks[node.name]
+          ? flattenParentBlocks(parentBlocks[node.name])
+          : [];
+        if (parentBlockList.length) {
+          node.parents = parentBlockList;
+          parentBlockList.forEach(function(parentBlock) {
+            switch (node.mode) {
+              case 'append':
+                parentBlock.nodes = parentBlock.nodes.concat(node.nodes);
+                break;
+              case 'prepend':
+                parentBlock.nodes = node.nodes.concat(parentBlock.nodes);
+                break;
+              case 'replace':
+                parentBlock.nodes = node.nodes;
+                break;
+            }
+          });
+        }
       }
-      stack[node.name] = node.name;
-      var parentBlockList = parentBlocks[node.name] ? flattenParentBlocks(parentBlocks[node.name]) : [];
-      if (parentBlockList.length) {
-        node.parents = parentBlockList;
-        parentBlockList.forEach(function (parentBlock) {
-          switch (node.mode) {
-            case 'append':
-              parentBlock.nodes = parentBlock.nodes.concat(node.nodes);
-              break;
-            case 'prepend':
-              parentBlock.nodes = node.nodes.concat(parentBlock.nodes);
-              break;
-            case 'replace':
-              parentBlock.nodes = node.nodes;
-              break;
-          }
-        });
+    },
+    function after(node) {
+      if (node.type === 'NamedBlock' && !node.ignore) {
+        delete stack[node.name];
       }
     }
-  }, function after(node) {
-    if (node.type === 'NamedBlock' && !node.ignore) {
-      delete stack[node.name];
-    }
-  });
+  );
 }
 
 function applyIncludes(ast, child) {
-  return walk(ast, function before(node, replace) {
-    if (node.type === 'RawInclude') {
-      replace({type: 'Text', val: node.file.str.replace(/\r/g, '')});
-    }
-  }, function after(node, replace) {
-    if (node.type === 'Include') {
-      var childAST = link(node.file.ast);
-      if (childAST.hasExtends) {
-        childAST = removeBlocks(childAST);
+  return walk(
+    ast,
+    function before(node, replace) {
+      if (node.type === 'RawInclude') {
+        replace({type: 'Text', val: node.file.str.replace(/\r/g, '')});
+      }
+    },
+    function after(node, replace) {
+      if (node.type === 'Include') {
+        var childAST = link(node.file.ast);
+        if (childAST.hasExtends) {
+          childAST = removeBlocks(childAST);
+        }
+        replace(applyYield(childAST, node.block));
       }
-      replace(applyYield(childAST, node.block));
     }
-  });
+  );
 }
 function removeBlocks(ast) {
-  return walk(ast, function (node, replace) {
+  return walk(ast, function(node, replace) {
     if (node.type === 'NamedBlock') {
       replace({
         type: 'Block',
-        nodes: node.nodes
+        nodes: node.nodes,
       });
     }
   });
@@ -145,7 +162,7 @@ function removeBlocks(ast) {
 function applyYield(ast, block) {
   if (!block || !block.nodes.length) return ast;
   var replaced = false;
-  ast = walk(ast, null, function (node, replace) {
+  ast = walk(ast, null, function(node, replace) {
     if (node.type === 'YieldBlock') {
       replaced = true;
       node.type = 'Block';
@@ -173,12 +190,16 @@ function applyYield(ast, block) {
 
 function checkExtendPosition(ast, hasExtends) {
   var legitExtendsReached = false;
-  walk(ast, function (node) {
+  walk(ast, function(node) {
     if (node.type === 'Extends') {
       if (hasExtends && !legitExtendsReached) {
         legitExtendsReached = true;
       } else {
-        error('EXTENDS_NOT_FIRST', 'Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.', node);
+        error(
+          'EXTENDS_NOT_FIRST',
+          'Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.',
+          node
+        );
       }
     }
   });
diff --git a/packages/pug-linker/test/cases-src/auxiliary/includable.js b/packages/pug-linker/test/cases-src/auxiliary/includable.js
index f3efe1e66..38c071e0c 100644
--- a/packages/pug-linker/test/cases-src/auxiliary/includable.js
+++ b/packages/pug-linker/test/cases-src/auxiliary/includable.js
@@ -1,7 +1,8 @@
-var STRING_SUBSTITUTIONS = {    // table of character substitutions
+var STRING_SUBSTITUTIONS = {
+  // table of character substitutions
   '\t': '\\t',
   '\r': '\\r',
   '\n': '\\n',
-  '"' : '\\"',
-  '\\': '\\\\'
-};
\ No newline at end of file
+  '"': '\\"',
+  '\\': '\\\\',
+};
diff --git a/packages/pug-linker/test/cases-src/javascript-new-lines.js b/packages/pug-linker/test/cases-src/javascript-new-lines.js
index 6893341c5..bb0c26f05 100644
--- a/packages/pug-linker/test/cases-src/javascript-new-lines.js
+++ b/packages/pug-linker/test/cases-src/javascript-new-lines.js
@@ -1 +1 @@
-var x = "\n here is some \n new lined text";
+var x = '\n here is some \n new lined text';
diff --git a/packages/pug-linker/test/index.test.js b/packages/pug-linker/test/index.test.js
index 193d8c79f..862629d3c 100644
--- a/packages/pug-linker/test/index.test.js
+++ b/packages/pug-linker/test/index.test.js
@@ -2,45 +2,45 @@ var assert = require('assert');
 var fs = require('fs');
 var link = require('../');
 
-function testDir (dir) {
-  fs.readdirSync(dir).forEach(function (name) {
+function testDir(dir) {
+  fs.readdirSync(dir).forEach(function(name) {
     if (!/\.input\.json$/.test(name)) return;
-    test(name, function () {
+    test(name, function() {
       var actual = link(JSON.parse(fs.readFileSync(dir + '/' + name, 'utf8')));
       expect(actual).toMatchSnapshot();
     });
   });
 }
 
-function testDirError (dir) {
-  fs.readdirSync(dir).forEach(function (name) {
+function testDirError(dir) {
+  fs.readdirSync(dir).forEach(function(name) {
     if (!/\.input\.json$/.test(name)) return;
-    test(name, function () {
+    test(name, function() {
       var input = JSON.parse(fs.readFileSync(dir + '/' + name, 'utf8'));
       var err;
       try {
         link(input);
       } catch (ex) {
         err = {
-          msg:  ex.msg,
+          msg: ex.msg,
           code: ex.code,
-          line: ex.line
+          line: ex.line,
         };
       }
-      if (!err) throw new Error('Expected error')
+      if (!err) throw new Error('Expected error');
       expect(err).toMatchSnapshot();
     });
   });
 }
 
-describe('cases from pug', function () {
+describe('cases from pug', function() {
   testDir(__dirname + '/cases');
 });
 
-describe('special cases', function () {
+describe('special cases', function() {
   testDir(__dirname + '/special-cases');
 });
 
-describe('error handling', function () {
+describe('error handling', function() {
   testDirError(__dirname + '/errors');
 });
diff --git a/packages/pug-load/index.js b/packages/pug-load/index.js
index 9b12d3472..1eb1ffcb1 100644
--- a/packages/pug-load/index.js
+++ b/packages/pug-load/index.js
@@ -10,9 +10,13 @@ function load(ast, options) {
   options = getOptions(options);
   // clone the ast
   ast = JSON.parse(JSON.stringify(ast));
-  return walk(ast, function (node) {
+  return walk(ast, function(node) {
     if (node.str === undefined) {
-      if (node.type === 'Include' || node.type === 'RawInclude' || node.type === 'Extends') {
+      if (
+        node.type === 'Include' ||
+        node.type === 'RawInclude' ||
+        node.type === 'Extends'
+      ) {
         var file = node.file;
         if (file.type !== 'FileReference') {
           throw new Error('Expected file.type to be "FileReference"');
@@ -28,9 +32,12 @@ function load(ast, options) {
         }
         file.str = str;
         if (node.type === 'Extends' || node.type === 'Include') {
-          file.ast = load.string(str, assign({}, options, {
-            filename: path
-          }));
+          file.ast = load.string(
+            str,
+            assign({}, options, {
+              filename: path,
+            })
+          );
         }
       }
     }
@@ -39,7 +46,7 @@ function load(ast, options) {
 
 load.string = function loadString(src, options) {
   options = assign(getOptions(options), {
-    src: src
+    src: src,
   });
   var tokens = options.lex(src, options);
   var ast = options.parse(tokens, options);
@@ -47,7 +54,7 @@ load.string = function loadString(src, options) {
 };
 load.file = function loadFile(filename, options) {
   options = assign(getOptions(options), {
-    filename: filename
+    filename: filename,
   });
   var str = options.read(filename);
   return load.string(str, options);
@@ -56,12 +63,19 @@ load.file = function loadFile(filename, options) {
 load.resolve = function resolve(filename, source, options) {
   filename = filename.trim();
   if (filename[0] !== '/' && !source)
-    throw new Error('the "filename" option is required to use includes and extends with "relative" paths');
+    throw new Error(
+      'the "filename" option is required to use includes and extends with "relative" paths'
+    );
 
   if (filename[0] === '/' && !options.basedir)
-    throw new Error('the "basedir" option is required to use includes and extends with "absolute" paths');
+    throw new Error(
+      'the "basedir" option is required to use includes and extends with "absolute" paths'
+    );
 
-  filename = path.join(filename[0] === '/' ? options.basedir : path.dirname(source.trim()), filename);
+  filename = path.join(
+    filename[0] === '/' ? options.basedir : path.dirname(source.trim()),
+    filename
+  );
 
   return filename;
 };
@@ -94,8 +108,11 @@ load.validateOptions = function validateOptions(options) {
 
 function getOptions(options) {
   load.validateOptions(options);
-  return assign({
-    resolve: load.resolve,
-    read: load.read
-  }, options);
+  return assign(
+    {
+      resolve: load.resolve,
+      read: load.read,
+    },
+    options
+  );
 }
diff --git a/packages/pug-load/test/index.test.js b/packages/pug-load/test/index.test.js
index 1ad7f607f..f8b21fb2e 100644
--- a/packages/pug-load/test/index.test.js
+++ b/packages/pug-load/test/index.test.js
@@ -12,13 +12,19 @@ test('pug-load', () => {
   var filename = __dirname + '/foo.pug';
   var ast = load.file(filename, {
     lex: lex,
-    parse: parse
+    parse: parse,
   });
 
-  ast = walk(ast, function (node) {
-    if (node.filename) node.filename = '<dirname>/' + path.basename(node.filename);
-    if (node.fullPath) node.fullPath = '<dirname>/' + path.basename(node.fullPath);
-  }, {includeDependencies: true});
+  ast = walk(
+    ast,
+    function(node) {
+      if (node.filename)
+        node.filename = '<dirname>/' + path.basename(node.filename);
+      if (node.fullPath)
+        node.fullPath = '<dirname>/' + path.basename(node.fullPath);
+    },
+    {includeDependencies: true}
+  );
 
   expect(ast).toMatchSnapshot();
 });
diff --git a/packages/pug-parser/index.js b/packages/pug-parser/index.js
index 54606315e..abd531ed5 100644
--- a/packages/pug-parser/index.js
+++ b/packages/pug-parser/index.js
@@ -11,7 +11,7 @@ function parse(tokens, options) {
   var parser = new Parser(tokens, options);
   var ast = parser.parse();
   return JSON.parse(JSON.stringify(ast));
-};
+}
 
 /**
  * Initialize `Parser` with the given input `str` and `filename`.
@@ -25,36 +25,39 @@ function parse(tokens, options) {
 function Parser(tokens, options) {
   options = options || {};
   if (!Array.isArray(tokens)) {
-    throw new Error('Expected tokens to be an Array but got "' + (typeof tokens) + '"');
+    throw new Error(
+      'Expected tokens to be an Array but got "' + typeof tokens + '"'
+    );
   }
   if (typeof options !== 'object') {
-    throw new Error('Expected "options" to be an object but got "' + (typeof options) + '"');
+    throw new Error(
+      'Expected "options" to be an object but got "' + typeof options + '"'
+    );
   }
   this.tokens = new TokenStream(tokens);
   this.filename = options.filename;
   this.src = options.src;
   this.inMixin = 0;
   this.plugins = options.plugins || [];
-};
+}
 
 /**
  * Parser prototype.
  */
 
 Parser.prototype = {
-
   /**
    * Save original constructor
    */
 
   constructor: Parser,
 
-  error: function (code, message, token) {
+  error: function(code, message, token) {
     var err = error(code, message, {
       line: token.loc.start.line,
       column: token.loc.start.column,
       filename: this.filename,
-      src: this.src
+      src: this.src,
     });
     throw err;
   },
@@ -66,7 +69,7 @@ Parser.prototype = {
    * @api private
    */
 
-  advance: function(){
+  advance: function() {
     return this.tokens.advance();
   },
 
@@ -89,7 +92,7 @@ Parser.prototype = {
    * @api private
    */
 
-  lookahead: function(n){
+  lookahead: function(n) {
     return this.tokens.lookahead(n);
   },
 
@@ -100,7 +103,7 @@ Parser.prototype = {
    * @api public
    */
 
-  parse: function(){
+  parse: function() {
     var block = this.emptyBlock(0);
 
     while ('eos' != this.peek().type) {
@@ -130,11 +133,15 @@ Parser.prototype = {
    * @api private
    */
 
-  expect: function(type){
+  expect: function(type) {
     if (this.peek().type === type) {
       return this.advance();
     } else {
-      this.error('INVALID_TOKEN', 'expected "' + type + '", but got "' + this.peek().type + '"', this.peek());
+      this.error(
+        'INVALID_TOKEN',
+        'expected "' + type + '", but got "' + this.peek().type + '"',
+        this.peek()
+      );
     }
   },
 
@@ -145,7 +152,7 @@ Parser.prototype = {
    * @api private
    */
 
-  accept: function(type){
+  accept: function(type) {
     if (this.peek().type === type) {
       return this.advance();
     }
@@ -160,7 +167,7 @@ Parser.prototype = {
       type: 'Block',
       nodes: nodes,
       line: line,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -177,11 +184,18 @@ Parser.prototype = {
     for (var i = 0; i < this.plugins.length; i++) {
       var plugin = this.plugins[i];
       if (plugin[context] && plugin[context][tok.type]) {
-        if (pluginContext) throw new Error('Multiple plugin handlers found for context ' + JSON.stringify(context) + ', token type ' + JSON.stringify(tok.type));
+        if (pluginContext)
+          throw new Error(
+            'Multiple plugin handlers found for context ' +
+              JSON.stringify(context) +
+              ', token type ' +
+              JSON.stringify(tok.type)
+          );
         pluginContext = plugin[context];
       }
     }
-    if (pluginContext) return pluginContext[tok.type].apply(pluginContext, rest);
+    if (pluginContext)
+      return pluginContext[tok.type].apply(pluginContext, rest);
   },
 
   /**
@@ -202,7 +216,7 @@ Parser.prototype = {
    * | interpolation
    */
 
-  parseExpr: function(){
+  parseExpr: function() {
     switch (this.peek().type) {
       case 'tag':
         return this.parseTag();
@@ -257,13 +271,17 @@ Parser.prototype = {
           type: 'tag',
           val: 'div',
           loc: this.peek().loc,
-          filename: this.filename
+          filename: this.filename,
         });
         return this.parseExpr();
       default:
         var pluginResult = this.runPlugin('expressionTokens', this.peek());
         if (pluginResult) return pluginResult;
-        this.error('INVALID_TOKEN', 'unexpected token "' + this.peek().type + '"', this.peek());
+        this.error(
+          'INVALID_TOKEN',
+          'unexpected token "' + this.peek().type + '"',
+          this.peek()
+        );
     }
   },
 
@@ -276,71 +294,69 @@ Parser.prototype = {
    * Text
    */
 
-  parseText: function(options){
+  parseText: function(options) {
     var tags = [];
     var lineno = this.peek().loc.start.line;
     var nextTok = this.peek();
-    loop:
-      while (true) {
-        switch (nextTok.type) {
-          case 'text':
-            var tok = this.advance();
+    loop: while (true) {
+      switch (nextTok.type) {
+        case 'text':
+          var tok = this.advance();
+          tags.push({
+            type: 'Text',
+            val: tok.val,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
+            filename: this.filename,
+          });
+          break;
+        case 'interpolated-code':
+          var tok = this.advance();
+          tags.push({
+            type: 'Code',
+            val: tok.val,
+            buffer: tok.buffer,
+            mustEscape: tok.mustEscape !== false,
+            isInline: true,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
+            filename: this.filename,
+          });
+          break;
+        case 'newline':
+          if (!options || !options.block) break loop;
+          var tok = this.advance();
+          var nextType = this.peek().type;
+          if (nextType === 'text' || nextType === 'interpolated-code') {
             tags.push({
               type: 'Text',
-              val: tok.val,
-              line: tok.loc.start.line,
-              column: tok.loc.start.column,
-              filename: this.filename
-            });
-            break;
-          case 'interpolated-code':
-            var tok = this.advance();
-            tags.push({
-              type: 'Code',
-              val: tok.val,
-              buffer: tok.buffer,
-              mustEscape: tok.mustEscape !== false,
-              isInline: true,
+              val: '\n',
               line: tok.loc.start.line,
               column: tok.loc.start.column,
-              filename: this.filename
+              filename: this.filename,
             });
-            break;
-          case 'newline':
-            if (!options || !options.block) break loop;
-            var tok = this.advance();
-            var nextType = this.peek().type;
-            if (nextType === 'text' || nextType === 'interpolated-code') {
-              tags.push({
-                type: 'Text',
-                val: '\n',
-                line: tok.loc.start.line,
-                column: tok.loc.start.column,
-                filename: this.filename
-              });
-            }
-            break;
-          case 'start-pug-interpolation':
-            this.advance();
-            tags.push(this.parseExpr());
-            this.expect('end-pug-interpolation');
-            break;
-          default:
-            var pluginResult = this.runPlugin('textTokens', nextTok, tags);
-            if (pluginResult) break;
-            break loop;
-        }
-        nextTok = this.peek();
+          }
+          break;
+        case 'start-pug-interpolation':
+          this.advance();
+          tags.push(this.parseExpr());
+          this.expect('end-pug-interpolation');
+          break;
+        default:
+          var pluginResult = this.runPlugin('textTokens', nextTok, tags);
+          if (pluginResult) break;
+          break loop;
       }
+      nextTok = this.peek();
+    }
     if (tags.length === 1) return tags[0];
     else return this.initBlock(lineno, tags);
   },
 
-  parseTextHtml: function () {
+  parseTextHtml: function() {
     var nodes = [];
     var currentNode = null;
-loop:
-    while (true) {
+    loop: while (true) {
       switch (this.peek().type) {
         case 'text-html':
           var text = this.advance();
@@ -351,7 +367,7 @@ loop:
               filename: this.filename,
               line: text.loc.start.line,
               column: text.loc.start.column,
-              isHtml: true
+              isHtml: true,
             };
             nodes.push(currentNode);
           } else {
@@ -360,7 +376,7 @@ loop:
           break;
         case 'indent':
           var block = this.block();
-          block.nodes.forEach(function (node) {
+          block.nodes.forEach(function(node) {
             if (node.isHtml) {
               if (!currentNode) {
                 currentNode = node;
@@ -393,11 +409,13 @@ loop:
    * | block
    */
 
-  parseBlockExpansion: function(){
+  parseBlockExpansion: function() {
     var tok = this.accept(':');
     if (tok) {
       var expr = this.parseExpr();
-      return expr.type === 'Block' ? expr : this.initBlock(tok.loc.start.line, [expr]);
+      return expr.type === 'Block'
+        ? expr
+        : this.initBlock(tok.loc.start.line, [expr]);
     } else {
       return this.block();
     }
@@ -407,14 +425,14 @@ loop:
    * case
    */
 
-  parseCase: function(){
+  parseCase: function() {
     var tok = this.expect('case');
     var node = {
       type: 'Case',
       expr: tok.val,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
 
     var block = this.emptyBlock(tok.loc.start.line + 1);
@@ -434,8 +452,13 @@ loop:
         default:
           var pluginResult = this.runPlugin('caseTokens', this.peek(), block);
           if (pluginResult) break;
-          this.error('INVALID_TOKEN', 'Unexpected token "' + this.peek().type
-                          + '", expected "when", "default" or "newline"', this.peek());
+          this.error(
+            'INVALID_TOKEN',
+            'Unexpected token "' +
+              this.peek().type +
+              '", expected "when", "default" or "newline"',
+            this.peek()
+          );
       }
     }
     this.expect('outdent');
@@ -449,7 +472,7 @@ loop:
    * when
    */
 
-  parseWhen: function(){
+  parseWhen: function() {
     var tok = this.expect('when');
     if (this.peek().type !== 'newline') {
       return {
@@ -459,7 +482,7 @@ loop:
         debug: false,
         line: tok.loc.start.line,
         column: tok.loc.start.column,
-        filename: this.filename
+        filename: this.filename,
       };
     } else {
       return {
@@ -468,7 +491,7 @@ loop:
         debug: false,
         line: tok.loc.start.line,
         column: tok.loc.start.column,
-        filename: this.filename
+        filename: this.filename,
       };
     }
   },
@@ -477,7 +500,7 @@ loop:
    * default
    */
 
-  parseDefault: function(){
+  parseDefault: function() {
     var tok = this.expect('default');
     return {
       type: 'When',
@@ -486,7 +509,7 @@ loop:
       debug: false,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -494,9 +517,12 @@ loop:
    * code
    */
 
-  parseCode: function(noBlock){
+  parseCode: function(noBlock) {
     var tok = this.expect('code');
-    assert(typeof tok.mustEscape === 'boolean', 'Please update to the newest version of pug-lexer.');
+    assert(
+      typeof tok.mustEscape === 'boolean',
+      'Please update to the newest version of pug-lexer.'
+    );
     var node = {
       type: 'Code',
       val: tok.val,
@@ -505,7 +531,7 @@ loop:
       isInline: !!noBlock,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
     // todo: why is this here?  It seems like a hacky workaround
     if (node.val.match(/^ *else/)) node.debug = false;
@@ -518,14 +544,18 @@ loop:
     block = 'indent' == this.peek().type;
     if (block) {
       if (tok.buffer) {
-        this.error('BLOCK_IN_BUFFERED_CODE', 'Buffered code cannot have a block attached to it', this.peek());
+        this.error(
+          'BLOCK_IN_BUFFERED_CODE',
+          'Buffered code cannot have a block attached to it',
+          this.peek()
+        );
       }
       node.block = this.block();
     }
 
     return node;
   },
-  parseConditional: function(){
+  parseConditional: function() {
     var tok = this.expect('if');
     var node = {
       type: 'Conditional',
@@ -534,7 +564,7 @@ loop:
       alternate: null,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
 
     // handle block
@@ -548,17 +578,15 @@ loop:
         this.expect('newline');
       } else if (this.peek().type === 'else-if') {
         tok = this.expect('else-if');
-        currentNode = (
-          currentNode.alternate = {
-            type: 'Conditional',
-            test: tok.val,
-            consequent: this.emptyBlock(tok.loc.start.line),
-            alternate: null,
-            line: tok.loc.start.line,
-            column: tok.loc.start.column,
-            filename: this.filename
-          }
-        );
+        currentNode = currentNode.alternate = {
+          type: 'Conditional',
+          test: tok.val,
+          consequent: this.emptyBlock(tok.loc.start.line),
+          alternate: null,
+          line: tok.loc.start.line,
+          column: tok.loc.start.column,
+          filename: this.filename,
+        };
         if ('indent' == this.peek().type) {
           currentNode.consequent = this.block();
         }
@@ -575,14 +603,14 @@ loop:
 
     return node;
   },
-  parseWhile: function(){
+  parseWhile: function() {
     var tok = this.expect('while');
     var node = {
       type: 'While',
       test: tok.val,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
 
     // handle block
@@ -599,7 +627,7 @@ loop:
    * block code
    */
 
-  parseBlockCode: function(){
+  parseBlockCode: function() {
     var tok = this.expect('blockcode');
     var line = tok.loc.start.line;
     var column = tok.loc.start.column;
@@ -622,7 +650,11 @@ loop:
               text += pluginResult;
               break;
             }
-            this.error('INVALID_TOKEN', 'Unexpected token type: ' + tok.type, tok);
+            this.error(
+              'INVALID_TOKEN',
+              'Unexpected token type: ' + tok.type,
+              tok
+            );
         }
       }
       this.advance();
@@ -635,17 +667,17 @@ loop:
       isInline: false,
       line: line,
       column: column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
   /**
    * comment
    */
 
-  parseComment: function(){
+  parseComment: function() {
     var tok = this.expect('comment');
     var block;
-    if (block = this.parseTextBlock()) {
+    if ((block = this.parseTextBlock())) {
       return {
         type: 'BlockComment',
         val: tok.val,
@@ -653,7 +685,7 @@ loop:
         buffer: tok.buffer,
         line: tok.loc.start.line,
         column: tok.loc.start.column,
-        filename: this.filename
+        filename: this.filename,
       };
     } else {
       return {
@@ -662,7 +694,7 @@ loop:
         buffer: tok.buffer,
         line: tok.loc.start.line,
         column: tok.loc.start.column,
-        filename: this.filename
+        filename: this.filename,
       };
     }
   },
@@ -671,14 +703,14 @@ loop:
    * doctype
    */
 
-  parseDoctype: function(){
+  parseDoctype: function() {
     var tok = this.expect('doctype');
     return {
       type: 'Doctype',
       val: tok.val,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -696,7 +728,7 @@ loop:
       attrs: attrs,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -704,9 +736,10 @@ loop:
    * filter attrs? text-block
    */
 
-  parseFilter: function(){
+  parseFilter: function() {
     var tok = this.expect('filter');
-    var block, attrs = [];
+    var block,
+      attrs = [];
 
     if (this.peek().type === 'start-attributes') {
       attrs = this.attrs();
@@ -720,8 +753,8 @@ loop:
           val: textToken.val,
           line: textToken.loc.start.line,
           column: textToken.loc.start.column,
-          filename: this.filename
-        }
+          filename: this.filename,
+        },
       ]);
     } else if (this.peek().type === 'filter') {
       block = this.initBlock(tok.loc.start.line, [this.parseFilter()]);
@@ -736,7 +769,7 @@ loop:
       attrs: attrs,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -744,7 +777,7 @@ loop:
    * each block
    */
 
-  parseEach: function(){
+  parseEach: function() {
     var tok = this.expect('each');
     var node = {
       type: 'Each',
@@ -754,7 +787,7 @@ loop:
       block: this.block(),
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
     if (this.peek().type == 'else') {
       this.advance();
@@ -763,7 +796,7 @@ loop:
     return node;
   },
 
-  parseEachOf: function(){
+  parseEachOf: function() {
     var tok = this.expect('eachOf');
     var node = {
       type: 'EachOf',
@@ -772,7 +805,7 @@ loop:
       block: this.block(),
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
     return node;
   },
@@ -780,7 +813,7 @@ loop:
    * 'extends' name
    */
 
-  parseExtends: function(){
+  parseExtends: function() {
     var tok = this.expect('extends');
     var path = this.expect('path');
     return {
@@ -790,11 +823,11 @@ loop:
         path: path.val.trim(),
         line: path.loc.start.line,
         column: path.loc.start.column,
-        filename: this.filename
+        filename: this.filename,
       },
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -802,10 +835,13 @@ loop:
    * 'block' name block
    */
 
-  parseBlock: function(){
+  parseBlock: function() {
     var tok = this.expect('block');
 
-    var node = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
+    var node =
+      'indent' == this.peek().type
+        ? this.block()
+        : this.emptyBlock(tok.loc.start.line);
     node.type = 'NamedBlock';
     node.name = tok.val.trim();
     node.mode = tok.mode;
@@ -815,16 +851,20 @@ loop:
     return node;
   },
 
-  parseMixinBlock: function () {
+  parseMixinBlock: function() {
     var tok = this.expect('mixin-block');
     if (!this.inMixin) {
-      this.error('BLOCK_OUTISDE_MIXIN', 'Anonymous blocks are not allowed unless they are part of a mixin.', tok);
+      this.error(
+        'BLOCK_OUTISDE_MIXIN',
+        'Anonymous blocks are not allowed unless they are part of a mixin.',
+        tok
+      );
     }
     return {
       type: 'MixinBlock',
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -834,7 +874,7 @@ loop:
       type: 'YieldBlock',
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
   },
 
@@ -842,17 +882,17 @@ loop:
    * include block?
    */
 
-  parseInclude: function(){
+  parseInclude: function() {
     var tok = this.expect('include');
     var node = {
       type: 'Include',
       file: {
         type: 'FileReference',
-        filename: this.filename
+        filename: this.filename,
       },
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
     var filters = [];
     while (this.peek().type === 'filter') {
@@ -864,19 +904,33 @@ loop:
     node.file.line = path.loc.start.line;
     node.file.column = path.loc.start.column;
 
-    if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !filters.length) {
-      node.block = 'indent' == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
+    if (
+      (/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) &&
+      !filters.length
+    ) {
+      node.block =
+        'indent' == this.peek().type
+          ? this.block()
+          : this.emptyBlock(tok.loc.start.line);
       if (/\.jade$/.test(node.file.path)) {
         console.warn(
-          this.filename + ', line ' + tok.loc.start.line +
-          ':\nThe .jade extension is deprecated, use .pug for "' + node.file.path +'".'
+          this.filename +
+            ', line ' +
+            tok.loc.start.line +
+            ':\nThe .jade extension is deprecated, use .pug for "' +
+            node.file.path +
+            '".'
         );
       }
     } else {
       node.type = 'RawInclude';
       node.filters = filters;
       if (this.peek().type === 'indent') {
-        this.error('RAW_INCLUDE_BLOCK', 'Raw inclusion cannot contain a block', this.peek());
+        this.error(
+          'RAW_INCLUDE_BLOCK',
+          'Raw inclusion cannot contain a block',
+          this.peek()
+        );
       }
     }
     return node;
@@ -886,7 +940,7 @@ loop:
    * call ident block
    */
 
-  parseCall: function(){
+  parseCall: function() {
     var tok = this.expect('call');
     var name = tok.val;
     var args = tok.args;
@@ -900,7 +954,7 @@ loop:
       attributeBlocks: [],
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
 
     this.tag(mixin);
@@ -916,7 +970,7 @@ loop:
    * mixin block
    */
 
-  parseMixin: function(){
+  parseMixin: function() {
     var tok = this.expect('mixin');
     var name = tok.val;
     var args = tok.args;
@@ -931,12 +985,16 @@ loop:
         call: false,
         line: tok.loc.start.line,
         column: tok.loc.start.column,
-        filename: this.filename
+        filename: this.filename,
       };
       this.inMixin--;
       return mixin;
     } else {
-      this.error('MIXIN_WITHOUT_BODY', 'Mixin ' + name + ' declared without body', tok);
+      this.error(
+        'MIXIN_WITHOUT_BODY',
+        'Mixin ' + name + ' declared without body',
+        tok
+      );
     }
   },
 
@@ -944,7 +1002,7 @@ loop:
    * indent (text | newline)* outdent
    */
 
-  parseTextBlock: function(){
+  parseTextBlock: function() {
     var tok = this.accept('start-pipeless-text');
     if (!tok) return;
     var block = this.emptyBlock(tok.loc.start.line);
@@ -957,7 +1015,7 @@ loop:
             val: tok.val,
             line: tok.loc.start.line,
             column: tok.loc.start.column,
-            filename: this.filename
+            filename: this.filename,
           });
           break;
         case 'newline':
@@ -966,7 +1024,7 @@ loop:
             val: '\n',
             line: tok.loc.start.line,
             column: tok.loc.start.column,
-            filename: this.filename
+            filename: this.filename,
           });
           break;
         case 'start-pug-interpolation':
@@ -982,13 +1040,17 @@ loop:
             isInline: true,
             line: tok.loc.start.line,
             column: tok.loc.start.column,
-            filename: this.filename
+            filename: this.filename,
           });
           break;
         default:
           var pluginResult = this.runPlugin('textBlockTokens', tok, block, tok);
           if (pluginResult) break;
-          this.error('INVALID_TOKEN', 'Unexpected token type: ' + tok.type, tok);
+          this.error(
+            'INVALID_TOKEN',
+            'Unexpected token type: ' + tok.type,
+            tok
+          );
       }
     }
     this.advance();
@@ -999,7 +1061,7 @@ loop:
    * indent expr* outdent
    */
 
-  block: function(){
+  block: function() {
     var tok = this.expect('indent');
     var block = this.emptyBlock(tok.loc.start.line);
     while ('outdent' != this.peek().type) {
@@ -1024,7 +1086,7 @@ loop:
    * interpolation (attrs | class | id)* (text | code | ':')? newline* block?
    */
 
-  parseInterpolation: function(){
+  parseInterpolation: function() {
     var tok = this.advance();
     var tag = {
       type: 'InterpolatedTag',
@@ -1036,7 +1098,7 @@ loop:
       isInline: false,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
 
     return this.tag(tag, {selfClosingAllowed: true});
@@ -1046,7 +1108,7 @@ loop:
    * tag (attrs | class | id)* (text | code | ':')? newline* block?
    */
 
-  parseTag: function(){
+  parseTag: function() {
     var tok = this.advance();
     var tag = {
       type: 'Tag',
@@ -1058,7 +1120,7 @@ loop:
       isInline: inlineTags.indexOf(tok.val) !== -1,
       line: tok.loc.start.line,
       column: tok.loc.start.column,
-      filename: this.filename
+      filename: this.filename,
     };
 
     return this.tag(tag, {selfClosingAllowed: true});
@@ -1073,50 +1135,63 @@ loop:
     var attributeNames = [];
     var selfClosingAllowed = options && options.selfClosingAllowed;
     // (attrs | class | id)*
-    out:
-      while (true) {
-        switch (this.peek().type) {
-          case 'id':
-          case 'class':
-            var tok = this.advance();
-            if (tok.type === 'id') {
-              if (attributeNames.indexOf('id') !== -1) {
-                this.error('DUPLICATE_ID', 'Duplicate attribute "id" is not allowed.', tok);
-              }
-              attributeNames.push('id');
-            }
-            tag.attrs.push({
-              name: tok.type,
-              val: "'" + tok.val + "'",
-              line: tok.loc.start.line,
-              column: tok.loc.start.column,
-              filename: this.filename,
-              mustEscape: false
-            });
-            continue;
-          case 'start-attributes':
-            if (seenAttrs) {
-              console.warn(this.filename + ', line ' + this.peek().loc.start.line + ':\nYou should not have pug tags with multiple attributes.');
+    out: while (true) {
+      switch (this.peek().type) {
+        case 'id':
+        case 'class':
+          var tok = this.advance();
+          if (tok.type === 'id') {
+            if (attributeNames.indexOf('id') !== -1) {
+              this.error(
+                'DUPLICATE_ID',
+                'Duplicate attribute "id" is not allowed.',
+                tok
+              );
             }
-            seenAttrs = true;
-            tag.attrs = tag.attrs.concat(this.attrs(attributeNames));
-            continue;
-          case '&attributes':
-            var tok = this.advance();
-            tag.attributeBlocks.push({
-              type: 'AttributeBlock',
-              val: tok.val,
-              line: tok.loc.start.line,
-              column: tok.loc.start.column,
-              filename: this.filename
-            });
-            break;
-          default:
-            var pluginResult = this.runPlugin('tagAttributeTokens', this.peek(), tag, attributeNames);
-            if (pluginResult) break;
-            break out;
-        }
+            attributeNames.push('id');
+          }
+          tag.attrs.push({
+            name: tok.type,
+            val: "'" + tok.val + "'",
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
+            filename: this.filename,
+            mustEscape: false,
+          });
+          continue;
+        case 'start-attributes':
+          if (seenAttrs) {
+            console.warn(
+              this.filename +
+                ', line ' +
+                this.peek().loc.start.line +
+                ':\nYou should not have pug tags with multiple attributes.'
+            );
+          }
+          seenAttrs = true;
+          tag.attrs = tag.attrs.concat(this.attrs(attributeNames));
+          continue;
+        case '&attributes':
+          var tok = this.advance();
+          tag.attributeBlocks.push({
+            type: 'AttributeBlock',
+            val: tok.val,
+            line: tok.loc.start.line,
+            column: tok.loc.start.column,
+            filename: this.filename,
+          });
+          break;
+        default:
+          var pluginResult = this.runPlugin(
+            'tagAttributeTokens',
+            this.peek(),
+            tag,
+            attributeNames
+          );
+          if (pluginResult) break;
+          break out;
       }
+    }
 
     // check immediate '.'
     if ('dot' == this.peek().type) {
@@ -1141,7 +1216,8 @@ loop:
       case ':':
         this.advance();
         var expr = this.parseExpr();
-        tag.block = expr.type === 'Block' ? expr : this.initBlock(tag.line, [expr]);
+        tag.block =
+          expr.type === 'Block' ? expr : this.initBlock(tag.line, [expr]);
         break;
       case 'newline':
       case 'indent':
@@ -1157,9 +1233,22 @@ loop:
           break;
         }
       default:
-        var pluginResult = this.runPlugin('tagTokens', this.peek(), tag, options);
+        var pluginResult = this.runPlugin(
+          'tagTokens',
+          this.peek(),
+          tag,
+          options
+        );
         if (pluginResult) break;
-        this.error('INVALID_TOKEN', 'Unexpected token `' + this.peek().type + '` expected `text`, `interpolated-code`, `code`, `:`' + (selfClosingAllowed ? ', `slash`' : '') + ', `newline` or `eos`', this.peek())
+        this.error(
+          'INVALID_TOKEN',
+          'Unexpected token `' +
+            this.peek().type +
+            '` expected `text`, `interpolated-code`, `code`, `:`' +
+            (selfClosingAllowed ? ', `slash`' : '') +
+            ', `newline` or `eos`',
+          this.peek()
+        );
     }
 
     // newline*
@@ -1186,7 +1275,11 @@ loop:
     while (tok.type === 'attribute') {
       if (tok.name !== 'class' && attributeNames) {
         if (attributeNames.indexOf(tok.name) !== -1) {
-          this.error('DUPLICATE_ATTRIBUTE', 'Duplicate attribute "' + tok.name + '" is not allowed.', tok);
+          this.error(
+            'DUPLICATE_ATTRIBUTE',
+            'Duplicate attribute "' + tok.name + '" is not allowed.',
+            tok
+          );
         }
         attributeNames.push(tok.name);
       }
@@ -1196,12 +1289,12 @@ loop:
         line: tok.loc.start.line,
         column: tok.loc.start.column,
         filename: this.filename,
-        mustEscape: tok.mustEscape !== false
+        mustEscape: tok.mustEscape !== false,
       });
       tok = this.advance();
     }
     this.tokens.defer(tok);
     this.expect('end-attributes');
     return attrs;
-  }
-};
\ No newline at end of file
+  },
+};
diff --git a/packages/pug-parser/lib/inline-tags.js b/packages/pug-parser/lib/inline-tags.js
index a2345b1fd..92cda828c 100644
--- a/packages/pug-parser/lib/inline-tags.js
+++ b/packages/pug-parser/lib/inline-tags.js
@@ -1,23 +1,23 @@
 'use strict';
 
 module.exports = [
-    'a'
-  , 'abbr'
-  , 'acronym'
-  , 'b'
-  , 'br'
-  , 'code'
-  , 'em'
-  , 'font'
-  , 'i'
-  , 'img'
-  , 'ins'
-  , 'kbd'
-  , 'map'
-  , 'samp'
-  , 'small'
-  , 'span'
-  , 'strong'
-  , 'sub'
-  , 'sup'
-];
\ No newline at end of file
+  'a',
+  'abbr',
+  'acronym',
+  'b',
+  'br',
+  'code',
+  'em',
+  'font',
+  'i',
+  'img',
+  'ins',
+  'kbd',
+  'map',
+  'samp',
+  'small',
+  'span',
+  'strong',
+  'sub',
+  'sup',
+];
diff --git a/packages/pug-parser/test/index.test.js b/packages/pug-parser/test/index.test.js
index 961ecbacd..c0b9721d1 100644
--- a/packages/pug-parser/test/index.test.js
+++ b/packages/pug-parser/test/index.test.js
@@ -4,21 +4,26 @@ var fs = require('fs');
 var getRepo = require('get-repo');
 var parse = require('../');
 
-var testCases = fs.readdirSync(__dirname + '/cases').filter(function (name) {
+var testCases = fs.readdirSync(__dirname + '/cases').filter(function(name) {
   return /\.tokens\.json$/.test(name);
 });
 
 function parseNewlineJson(str) {
-  return str.split('\n').filter(Boolean).map(JSON.parse)
+  return str
+    .split('\n')
+    .filter(Boolean)
+    .map(JSON.parse);
 }
 
 function read(path) {
   return fs.readFileSync(__dirname + '/cases/' + path, 'utf8');
 }
 
-testCases.forEach(function (filename) {
+testCases.forEach(function(filename) {
   test(filename, () => {
-    var actualAst = parse(parseNewlineJson(read(filename)), {filename: filename});
+    var actualAst = parse(parseNewlineJson(read(filename)), {
+      filename: filename,
+    });
     expect(actualAst).toMatchSnapshot();
   });
 });
diff --git a/packages/pug-parser/test/no-unnecessary-blocks.test.js b/packages/pug-parser/test/no-unnecessary-blocks.test.js
index 30b5c7df4..b6e208a51 100644
--- a/packages/pug-parser/test/no-unnecessary-blocks.test.js
+++ b/packages/pug-parser/test/no-unnecessary-blocks.test.js
@@ -7,7 +7,7 @@ const input = `
 div
   | Hello
   | World
-`
+`;
 
 test('no uncessessary blocks should be added', () => {
   expect(parse(lex(input))).toMatchSnapshot();
diff --git a/packages/pug-runtime/build.js b/packages/pug-runtime/build.js
index 04c247f40..b6c6c135a 100644
--- a/packages/pug-runtime/build.js
+++ b/packages/pug-runtime/build.js
@@ -9,7 +9,7 @@ module.exports = build;
 
 function build(functions) {
   var fns = [];
-  functions = functions.filter(function (fn) {
+  functions = functions.filter(function(fn) {
     return !internals[fn];
   });
   for (var i = 0; i < functions.length; i++) {
@@ -18,7 +18,10 @@ function build(functions) {
       functions.push.apply(functions, dependencies[functions[i]]);
     }
   }
-  return fns.sort().map(function (name) {
-    return sources[name];
-  }).join('\n');
+  return fns
+    .sort()
+    .map(function(name) {
+      return sources[name];
+    })
+    .join('\n');
 }
diff --git a/packages/pug-runtime/index.js b/packages/pug-runtime/index.js
index 4bd21803d..84c615eaa 100644
--- a/packages/pug-runtime/index.js
+++ b/packages/pug-runtime/index.js
@@ -40,7 +40,7 @@ function pug_merge(a, b) {
   }
 
   return a;
-};
+}
 
 /**
  * Process array, object, or string as a string of classes delimited by a space.
@@ -61,7 +61,10 @@ function pug_merge(a, b) {
  */
 exports.classes = pug_classes;
 function pug_classes_array(val, escaping) {
-  var classString = '', className, padding = '', escapeEnabled = Array.isArray(escaping);
+  var classString = '',
+    className,
+    padding = '',
+    escapeEnabled = Array.isArray(escaping);
   for (var i = 0; i < val.length; i++) {
     className = pug_classes(val[i]);
     if (!className) continue;
@@ -72,7 +75,8 @@ function pug_classes_array(val, escaping) {
   return classString;
 }
 function pug_classes_object(val) {
-  var classString = '', padding = '';
+  var classString = '',
+    padding = '';
   for (var key in val) {
     if (key && val[key] && pug_has_own_property.call(val, key)) {
       classString = classString + padding + key;
@@ -113,7 +117,7 @@ function pug_style(val) {
   } else {
     return val + '';
   }
-};
+}
 
 /**
  * Render the given attribute.
@@ -126,25 +130,32 @@ function pug_style(val) {
  */
 exports.attr = pug_attr;
 function pug_attr(key, val, escaped, terse) {
-  if (val === false || val == null || !val && (key === 'class' || key === 'style')) {
+  if (
+    val === false ||
+    val == null ||
+    (!val && (key === 'class' || key === 'style'))
+  ) {
     return '';
   }
   if (val === true) {
     return ' ' + (terse ? key : key + '="' + key + '"');
   }
   var type = typeof val;
-  if ((type === 'object' || type === 'function') && typeof val.toJSON === 'function') {
+  if (
+    (type === 'object' || type === 'function') &&
+    typeof val.toJSON === 'function'
+  ) {
     val = val.toJSON();
   }
   if (typeof val !== 'string') {
     val = JSON.stringify(val);
     if (!escaped && val.indexOf('"') !== -1) {
-      return ' ' + key + '=\'' + val.replace(/'/g, '&#39;') + '\'';
+      return ' ' + key + "='" + val.replace(/'/g, '&#39;') + "'";
     }
   }
   if (escaped) val = pug_escape(val);
   return ' ' + key + '="' + val + '"';
-};
+}
 
 /**
  * Render the given attributes object.
@@ -154,7 +165,7 @@ function pug_attr(key, val, escaped, terse) {
  * @return {String}
  */
 exports.attrs = pug_attrs;
-function pug_attrs(obj, terse){
+function pug_attrs(obj, terse) {
   var attrs = '';
 
   for (var key in obj) {
@@ -174,7 +185,7 @@ function pug_attrs(obj, terse){
   }
 
   return attrs;
-};
+}
 
 /**
  * Escape the given string of `html`.
@@ -186,7 +197,7 @@ function pug_attrs(obj, terse){
 
 var pug_match_html = /["&<>]/;
 exports.escape = pug_escape;
-function pug_escape(_html){
+function pug_escape(_html) {
   var html = '' + _html;
   var regexResult = pug_match_html.exec(html);
   if (!regexResult) return _html;
@@ -195,11 +206,20 @@ function pug_escape(_html){
   var i, lastIndex, escape;
   for (i = regexResult.index, lastIndex = 0; i < html.length; i++) {
     switch (html.charCodeAt(i)) {
-      case 34: escape = '&quot;'; break;
-      case 38: escape = '&amp;'; break;
-      case 60: escape = '&lt;'; break;
-      case 62: escape = '&gt;'; break;
-      default: continue;
+      case 34:
+        escape = '&quot;';
+        break;
+      case 38:
+        escape = '&amp;';
+        break;
+      case 60:
+        escape = '&lt;';
+        break;
+      case 62:
+        escape = '&gt;';
+        break;
+      default:
+        continue;
     }
     if (lastIndex !== i) result += html.substring(lastIndex, i);
     lastIndex = i + 1;
@@ -207,7 +227,7 @@ function pug_escape(_html){
   }
   if (lastIndex !== i) return result + html.substring(lastIndex, i);
   else return result;
-};
+}
 
 /**
  * Re-throw the given `err` in context to the
@@ -221,36 +241,42 @@ function pug_escape(_html){
  */
 
 exports.rethrow = pug_rethrow;
-function pug_rethrow(err, filename, lineno, str){
+function pug_rethrow(err, filename, lineno, str) {
   if (!(err instanceof Error)) throw err;
   if ((typeof window != 'undefined' || !filename) && !str) {
     err.message += ' on line ' + lineno;
     throw err;
   }
   try {
-    str = str || require('fs').readFileSync(filename, 'utf8')
+    str = str || require('fs').readFileSync(filename, 'utf8');
   } catch (ex) {
-    pug_rethrow(err, null, lineno)
+    pug_rethrow(err, null, lineno);
   }
-  var context = 3
-    , lines = str.split('\n')
-    , start = Math.max(lineno - context, 0)
-    , end = Math.min(lines.length, lineno + context);
+  var context = 3,
+    lines = str.split('\n'),
+    start = Math.max(lineno - context, 0),
+    end = Math.min(lines.length, lineno + context);
 
   // Error context
-  var context = lines.slice(start, end).map(function(line, i){
-    var curr = i + start + 1;
-    return (curr == lineno ? '  > ' : '    ')
-      + curr
-      + '| '
-      + line;
-  }).join('\n');
+  var context = lines
+    .slice(start, end)
+    .map(function(line, i) {
+      var curr = i + start + 1;
+      return (curr == lineno ? '  > ' : '    ') + curr + '| ' + line;
+    })
+    .join('\n');
 
   // Alter exception message
   err.path = filename;
   try {
-    err.message = (filename || 'Pug') + ':' + lineno
-      + '\n' + context + '\n\n' + err.message;
+    err.message =
+      (filename || 'Pug') +
+      ':' +
+      lineno +
+      '\n' +
+      context +
+      '\n\n' +
+      err.message;
   } catch (e) {}
   throw err;
-};
+}
diff --git a/packages/pug-runtime/package.json b/packages/pug-runtime/package.json
index c13a435ce..e2e569c4d 100644
--- a/packages/pug-runtime/package.json
+++ b/packages/pug-runtime/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "prepublish": "node prepublish",
-    "pretest": "npm run prepublish"
+    "pretest": "npm run prepublish",
+    "build": "node prepublish"
   },
   "repository": {
     "type": "git",
diff --git a/packages/pug-runtime/prepublish.js b/packages/pug-runtime/prepublish.js
index 2544f0d56..a9f6abca3 100644
--- a/packages/pug-runtime/prepublish.js
+++ b/packages/pug-runtime/prepublish.js
@@ -13,38 +13,58 @@ var source = fs.readFileSync(__dirname + '/index.js', 'utf8');
 var ast = uglify.parse(source);
 
 var dependencies = {};
-var internals = {'dependencies': true, 'internals': true};
+var internals = {dependencies: true, internals: true};
 var sources = {};
-ast.body.forEach(function (node) {
+ast.body.forEach(function(node) {
   var name;
   switch (node.TYPE) {
-    case 'Defun': name = node.name.name;                break;
-    case 'Var':   name = node.definitions[0].name.name; break;
+    case 'Defun':
+      name = node.name.name;
+      break;
+    case 'Var':
+      name = node.definitions[0].name.name;
+      break;
   }
   if (!name || !/^pug\_/.test(name)) return;
   name = name.replace(/^pug\_/, '');
 
-  var src = uglify.minify(source.substring(node.start.pos, node.end.endpos), {fromString: true}).code;
+  var src = uglify.minify(source.substring(node.start.pos, node.end.endpos), {
+    fromString: true,
+  }).code;
   sources[name] = src;
 
   dependencies[name] = [];
   if (node.TYPE === 'Defun') {
     var ast = uglify.parse(src);
     ast.figure_out_scope();
-    var globals = ast.globals.map(function (val, key) {
+    var globals = ast.globals.map(function(val, key) {
       return key;
     });
-    dependencies[name] = globals.filter(function (key) { return /^pug\_/.test(key); })
-                                .map(function (key) { return key.replace(/^pug\_/, ''); });
+    dependencies[name] = globals
+      .filter(function(key) {
+        return /^pug\_/.test(key);
+      })
+      .map(function(key) {
+        return key.replace(/^pug\_/, '');
+      });
   }
 
   if (!runtime[name]) internals[name] = true;
 });
 
-Object.keys(dependencies).forEach(function (fn) {
+Object.keys(dependencies).forEach(function(fn) {
   dependencies[fn] = dependencies[fn].sort();
 });
 
-fs.writeFileSync(__dirname + '/lib/dependencies.js', 'module.exports = ' + JSON.stringify(dependencies, null, 2) + '\n');
-fs.writeFileSync(__dirname + '/lib/internals.js', 'module.exports = ' + JSON.stringify(internals, null, 2) + '\n');
-fs.writeFileSync(__dirname + '/lib/sources.js', 'module.exports = ' + JSON.stringify(sources, null, 2) + '\n');
+fs.writeFileSync(
+  __dirname + '/lib/dependencies.js',
+  'module.exports = ' + JSON.stringify(dependencies, null, 2) + '\n'
+);
+fs.writeFileSync(
+  __dirname + '/lib/internals.js',
+  'module.exports = ' + JSON.stringify(internals, null, 2) + '\n'
+);
+fs.writeFileSync(
+  __dirname + '/lib/sources.js',
+  'module.exports = ' + JSON.stringify(sources, null, 2) + '\n'
+);
diff --git a/packages/pug-runtime/test/index.test.js b/packages/pug-runtime/test/index.test.js
index 416489f01..1bf0f6e1f 100644
--- a/packages/pug-runtime/test/index.test.js
+++ b/packages/pug-runtime/test/index.test.js
@@ -5,15 +5,15 @@ var build = require('../build');
 var wrap = require('../wrap');
 
 function addTest(name, fn) {
-  test(name, function () {
-
+  test(name, function() {
     fn(runtime[name]);
     fn(Function('', build([name]) + ';return pug_' + name + ';')());
-    fn(wrap('function t() {return pug.' + name + ';}', 't')())
+    fn(wrap('function t() {return pug.' + name + ';}', 't')());
   });
 }
 
-addTest('attr', function (attr) { // (key, val, escaped, terse)
+addTest('attr', function(attr) {
+  // (key, val, escaped, terse)
   var stringToJSON = String.prototype.toJSON;
 
   String.prototype.toJSON = function() {
@@ -39,20 +39,56 @@ addTest('attr', function (attr) { // (key, val, escaped, terse)
   expect(attr('key', undefined, false, false)).toBe('');
 
   // Date Attributes
-  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), true, true)).toBe(' key="2014-12-28T16:46:06.962Z"');
-  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), false, true)).toBe(' key="2014-12-28T16:46:06.962Z"');
-  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), true, false)).toBe(' key="2014-12-28T16:46:06.962Z"');
-  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), false, false)).toBe(' key="2014-12-28T16:46:06.962Z"');
+  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), true, true)).toBe(
+    ' key="2014-12-28T16:46:06.962Z"'
+  );
+  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), false, true)).toBe(
+    ' key="2014-12-28T16:46:06.962Z"'
+  );
+  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), true, false)).toBe(
+    ' key="2014-12-28T16:46:06.962Z"'
+  );
+  expect(attr('key', new Date('2014-12-28T16:46:06.962Z'), false, false)).toBe(
+    ' key="2014-12-28T16:46:06.962Z"'
+  );
 
   // Custom JSON Attributes
-  expect(attr('key', {toJSON: function () { return 'bar'; }}, true, false)).toBe(' key="bar"');
-  expect(attr('key', {toJSON: function () { return {foo: 'bar'}; }}, true, false)).toBe(' key="{&quot;foo&quot;:&quot;bar&quot;}"');
+  expect(
+    attr(
+      'key',
+      {
+        toJSON: function() {
+          return 'bar';
+        },
+      },
+      true,
+      false
+    )
+  ).toBe(' key="bar"');
+  expect(
+    attr(
+      'key',
+      {
+        toJSON: function() {
+          return {foo: 'bar'};
+        },
+      },
+      true,
+      false
+    )
+  ).toBe(' key="{&quot;foo&quot;:&quot;bar&quot;}"');
 
   // JSON Attributes
-  expect(attr('key', {foo: 'bar'}, true, true)).toBe(' key="{&quot;foo&quot;:&quot;bar&quot;}"');
+  expect(attr('key', {foo: 'bar'}, true, true)).toBe(
+    ' key="{&quot;foo&quot;:&quot;bar&quot;}"'
+  );
   expect(attr('key', {foo: 'bar'}, false, true)).toBe(' key=\'{"foo":"bar"}\'');
-  expect(attr('key', {foo: 'don\'t'}, true, true)).toBe(' key="{&quot;foo&quot;:&quot;don\'t&quot;}"');
-  expect(attr('key', {foo: 'don\'t'}, false, true)).toBe(' key=\'{"foo":"don&#39;t"}\'');
+  expect(attr('key', {foo: "don't"}, true, true)).toBe(
+    ' key="{&quot;foo&quot;:&quot;don\'t&quot;}"'
+  );
+  expect(attr('key', {foo: "don't"}, false, true)).toBe(
+    ' key=\'{"foo":"don&#39;t"}\''
+  );
 
   // Number attributes
   expect(attr('key', 500, true, true)).toBe(' key="500"');
@@ -73,7 +109,8 @@ addTest('attr', function (attr) { // (key, val, escaped, terse)
   String.prototype.toJSON = stringToJSON;
 });
 
-addTest('attrs', function (attrs) { // (obj, terse)
+addTest('attrs', function(attrs) {
+  // (obj, terse)
   expect(attrs({foo: 'bar'}, true)).toBe(' foo="bar"');
   expect(attrs({foo: 'bar'}, false)).toBe(' foo="bar"');
   expect(attrs({foo: 'bar', hoo: 'boo'}, true)).toBe(' foo="bar" hoo="boo"');
@@ -84,24 +121,35 @@ addTest('attrs', function (attrs) { // (obj, terse)
   expect(attrs({class: ''}, false)).toBe('');
   expect(attrs({class: ['foo', {bar: true}]}, true)).toBe(' class="foo bar"');
   expect(attrs({class: ['foo', {bar: true}]}, false)).toBe(' class="foo bar"');
-  expect(attrs({class: ['foo', {bar: true}], foo: 'bar'}, true)).toBe(' class="foo bar" foo="bar"');
-  expect(attrs({foo: 'bar', class: ['foo', {bar: true}]}, false)).toBe(' class="foo bar" foo="bar"');
+  expect(attrs({class: ['foo', {bar: true}], foo: 'bar'}, true)).toBe(
+    ' class="foo bar" foo="bar"'
+  );
+  expect(attrs({foo: 'bar', class: ['foo', {bar: true}]}, false)).toBe(
+    ' class="foo bar" foo="bar"'
+  );
   expect(attrs({style: 'foo: bar;'}, true)).toBe(' style="foo: bar;"');
   expect(attrs({style: 'foo: bar;'}, false)).toBe(' style="foo: bar;"');
   expect(attrs({style: {foo: 'bar'}}, true)).toBe(' style="foo:bar;"');
   expect(attrs({style: {foo: 'bar'}}, false)).toBe(' style="foo:bar;"');
 });
 
-addTest('classes', function (classes) {
+addTest('classes', function(classes) {
   expect(classes(['foo', 'bar'])).toBe('foo bar');
-  expect(classes([['foo', 'bar'], ['baz', 'bash']])).toBe('foo bar baz bash');
-  expect(classes([['foo', 'bar'], {baz: true, bash: false}])).toBe('foo bar baz');
-  expect(classes([['fo<o', 'bar'], {'ba>z': true, bash: false}], [true, false])).toBe(
-    'fo&lt;o bar ba>z'
+  expect(
+    classes([
+      ['foo', 'bar'],
+      ['baz', 'bash'],
+    ])
+  ).toBe('foo bar baz bash');
+  expect(classes([['foo', 'bar'], {baz: true, bash: false}])).toBe(
+    'foo bar baz'
   );
+  expect(
+    classes([['fo<o', 'bar'], {'ba>z': true, bash: false}], [true, false])
+  ).toBe('fo&lt;o bar ba>z');
 });
 
-addTest('escape', function (escape) {
+addTest('escape', function(escape) {
   expect(escape('foo')).toBe('foo');
   expect(escape(10)).toBe(10);
   expect(escape('foo<bar')).toBe('foo&lt;bar');
@@ -111,33 +159,61 @@ addTest('escape', function (escape) {
   expect(escape('foo&<>"bar"')).toBe('foo&amp;&lt;&gt;&quot;bar&quot;');
 });
 
-addTest('merge', function (merge) {
+addTest('merge', function(merge) {
   expect(merge({foo: 'bar'}, {baz: 'bash'})).toEqual({foo: 'bar', baz: 'bash'});
-  expect(merge([{foo: 'bar'}, {baz: 'bash'}, {bing: 'bong'}])).toEqual({foo: 'bar', baz: 'bash', bing: 'bong'});
-  expect(merge({class: 'bar'}, {class: 'bash'})).toEqual({class: ['bar', 'bash']});
-  expect(merge({class: ['bar']}, {class: 'bash'})).toEqual({class: ['bar', 'bash']});
-  expect(merge({class: 'bar'}, {class: ['bash']})).toEqual({class: ['bar', 'bash']});
+  expect(merge([{foo: 'bar'}, {baz: 'bash'}, {bing: 'bong'}])).toEqual({
+    foo: 'bar',
+    baz: 'bash',
+    bing: 'bong',
+  });
+  expect(merge({class: 'bar'}, {class: 'bash'})).toEqual({
+    class: ['bar', 'bash'],
+  });
+  expect(merge({class: ['bar']}, {class: 'bash'})).toEqual({
+    class: ['bar', 'bash'],
+  });
+  expect(merge({class: 'bar'}, {class: ['bash']})).toEqual({
+    class: ['bar', 'bash'],
+  });
   expect(merge({class: 'bar'}, {class: null})).toEqual({class: ['bar']});
   expect(merge({class: null}, {class: ['bar']})).toEqual({class: ['bar']});
   expect(merge({}, {class: ['bar']})).toEqual({class: ['bar']});
   expect(merge({class: ['bar']}, {})).toEqual({class: ['bar']});
 
-  expect(merge({style: 'foo:bar'}, {style: 'baz:bash'})).toEqual({style: 'foo:bar;baz:bash;'});
-  expect(merge({style: 'foo:bar;'}, {style: 'baz:bash'})).toEqual({style: 'foo:bar;baz:bash;'});
-  expect(merge({style: {foo: 'bar'}}, {style: 'baz:bash'})).toEqual({style: 'foo:bar;baz:bash;'});
-  expect(merge({style: {foo: 'bar'}}, {style: {baz: 'bash'}})).toEqual({style: 'foo:bar;baz:bash;'});
+  expect(merge({style: 'foo:bar'}, {style: 'baz:bash'})).toEqual({
+    style: 'foo:bar;baz:bash;',
+  });
+  expect(merge({style: 'foo:bar;'}, {style: 'baz:bash'})).toEqual({
+    style: 'foo:bar;baz:bash;',
+  });
+  expect(merge({style: {foo: 'bar'}}, {style: 'baz:bash'})).toEqual({
+    style: 'foo:bar;baz:bash;',
+  });
+  expect(merge({style: {foo: 'bar'}}, {style: {baz: 'bash'}})).toEqual({
+    style: 'foo:bar;baz:bash;',
+  });
   expect(merge({style: 'foo:bar'}, {style: null})).toEqual({style: 'foo:bar;'});
-  expect(merge({style: 'foo:bar;'}, {style: null})).toEqual({style: 'foo:bar;'});
-  expect(merge({style: {foo: 'bar'}}, {style: null})).toEqual({style: 'foo:bar;'});
-  expect(merge({style: null}, {style: 'baz:bash'})).toEqual({style: 'baz:bash;'});
-  expect(merge({style: null}, {style: 'baz:bash'})).toEqual({style: 'baz:bash;'});
-  expect(merge({style: null}, {style: 'baz:bash'})).toEqual({style: 'baz:bash;'});
+  expect(merge({style: 'foo:bar;'}, {style: null})).toEqual({
+    style: 'foo:bar;',
+  });
+  expect(merge({style: {foo: 'bar'}}, {style: null})).toEqual({
+    style: 'foo:bar;',
+  });
+  expect(merge({style: null}, {style: 'baz:bash'})).toEqual({
+    style: 'baz:bash;',
+  });
+  expect(merge({style: null}, {style: 'baz:bash'})).toEqual({
+    style: 'baz:bash;',
+  });
+  expect(merge({style: null}, {style: 'baz:bash'})).toEqual({
+    style: 'baz:bash;',
+  });
   expect(merge({}, {style: 'baz:bash'})).toEqual({style: 'baz:bash;'});
   expect(merge({}, {style: 'baz:bash'})).toEqual({style: 'baz:bash;'});
   expect(merge({}, {style: 'baz:bash'})).toEqual({style: 'baz:bash;'});
 });
 
-addTest('style', function (style) {
+addTest('style', function(style) {
   expect(style(null)).toBe('');
   expect(style('')).toBe('');
   expect(style('foo: bar')).toBe('foo: bar');
diff --git a/packages/pug-runtime/wrap.js b/packages/pug-runtime/wrap.js
index 0a3250087..5acc2052a 100644
--- a/packages/pug-runtime/wrap.js
+++ b/packages/pug-runtime/wrap.js
@@ -3,8 +3,8 @@ var runtime = require('./');
 module.exports = wrap;
 function wrap(template, templateName) {
   templateName = templateName || 'template';
-  return Function('pug',
-    template + '\n' +
-    'return ' + templateName + ';'
+  return Function(
+    'pug',
+    template + '\n' + 'return ' + templateName + ';'
   )(runtime);
 }
diff --git a/packages/pug-strip-comments/index.js b/packages/pug-strip-comments/index.js
index 7d8bddea8..6da4f2ba0 100644
--- a/packages/pug-strip-comments/index.js
+++ b/packages/pug-strip-comments/index.js
@@ -4,18 +4,18 @@ var error = require('pug-error');
 
 module.exports = stripComments;
 
-function unexpectedToken (type, occasion, filename, line) {
+function unexpectedToken(type, occasion, filename, line) {
   var msg = '`' + type + '` encountered when ' + occasion;
-  throw error('UNEXPECTED_TOKEN', msg, { filename: filename, line: line });
+  throw error('UNEXPECTED_TOKEN', msg, {filename: filename, line: line});
 }
 
-function stripComments (input, options) {
+function stripComments(input, options) {
   options = options || {};
 
   // Default: strip unbuffered comments and leave buffered ones alone
   var stripUnbuffered = options.stripUnbuffered !== false;
-  var stripBuffered   = options.stripBuffered   === true;
-  var filename        = options.filename;
+  var stripBuffered = options.stripBuffered === true;
+  var filename = options.filename;
 
   var out = [];
   // If we have encountered a comment token and are not sure if we have gotten
@@ -25,12 +25,15 @@ function stripComments (input, options) {
   // `end-pipeless-text` should be ignored
   var inPipelessText = false;
 
-  return input.filter(function (tok) {
+  return input.filter(function(tok) {
     switch (tok.type) {
       case 'comment':
         if (inComment) {
           unexpectedToken(
-            'comment', 'already in a comment', filename, tok.line
+            'comment',
+            'already in a comment',
+            filename,
+            tok.line
           );
         } else {
           inComment = tok.buffer ? stripBuffered : stripUnbuffered;
@@ -40,8 +43,10 @@ function stripComments (input, options) {
         if (!inComment) return true;
         if (inPipelessText) {
           unexpectedToken(
-            'start-pipeless-text', 'already in pipeless text mode',
-            filename, tok.line
+            'start-pipeless-text',
+            'already in pipeless text mode',
+            filename,
+            tok.line
           );
         }
         inPipelessText = true;
@@ -50,8 +55,10 @@ function stripComments (input, options) {
         if (!inComment) return true;
         if (!inPipelessText) {
           unexpectedToken(
-            'end-pipeless-text', 'not in pipeless text mode',
-            filename, tok.line
+            'end-pipeless-text',
+            'not in pipeless text mode',
+            filename,
+            tok.line
           );
         }
         inPipelessText = false;
diff --git a/packages/pug-strip-comments/test/index.test.js b/packages/pug-strip-comments/test/index.test.js
index 7f3b51c18..f0e3ffc90 100644
--- a/packages/pug-strip-comments/test/index.test.js
+++ b/packages/pug-strip-comments/test/index.test.js
@@ -6,12 +6,12 @@ var lineJSON = require('line-json');
 var strip = require('../');
 
 var dir = __dirname + '/cases/';
-fs.readdirSync(dir).forEach(function (testCase) {
+fs.readdirSync(dir).forEach(function(testCase) {
   if (/\.input\.json$/.test(testCase)) {
-    test(testCase, function () {
+    test(testCase, function() {
       var stem = testCase.replace(/\.input\.json$/, '.');
 
-      function test (name, options) {
+      function test(name, options) {
         var input = fs.readFileSync(dir + testCase, 'utf8');
         input = lineJSON.parse(input);
 
@@ -20,16 +20,16 @@ fs.readdirSync(dir).forEach(function (testCase) {
       }
 
       test('unbuffered');
-      test('buffered',   { stripBuffered: true, stripUnbuffered: false });
-      test('both',       { stripBuffered: true });
+      test('buffered', {stripBuffered: true, stripUnbuffered: false});
+      test('both', {stripBuffered: true});
     });
   }
 });
 
 var edir = __dirname + '/errors/';
-fs.readdirSync(edir).forEach(function (testCase) {
+fs.readdirSync(edir).forEach(function(testCase) {
   if (/\.input\.json$/.test(testCase)) {
-    test(testCase, function () {
+    test(testCase, function() {
       var stem = testCase.replace(/\.input\.json$/, '.');
 
       var input = fs.readFileSync(edir + testCase, 'utf8');
@@ -43,7 +43,7 @@ fs.readdirSync(edir).forEach(function (testCase) {
         expect({
           msg: ex.msg,
           code: ex.code,
-          line: ex.line
+          line: ex.line,
         }).toMatchSnapshot();
       }
     });
diff --git a/packages/pug-walk/index.js b/packages/pug-walk/index.js
index 138aef0b3..9972e4b2f 100644
--- a/packages/pug-walk/index.js
+++ b/packages/pug-walk/index.js
@@ -7,17 +7,20 @@ function walkAST(ast, before, after, options) {
     after = null;
   }
   options = options || {includeDependencies: false};
-  var parents = options.parents = options.parents || [];
+  var parents = (options.parents = options.parents || []);
 
   var replace = function replace(replacement) {
     if (Array.isArray(replacement) && !replace.arrayAllowed) {
-      throw new Error('replace() can only be called with an array if the last parent is a Block or NamedBlock');
+      throw new Error(
+        'replace() can only be called with an array if the last parent is a Block or NamedBlock'
+      );
     }
     ast = replacement;
   };
-  replace.arrayAllowed = parents[0] && (
-    /^(Named)?Block$/.test(parents[0].type) ||
-    parents[0].type === 'RawInclude' && ast.type === 'IncludeFilter');
+  replace.arrayAllowed =
+    parents[0] &&
+    (/^(Named)?Block$/.test(parents[0].type) ||
+      (parents[0].type === 'RawInclude' && ast.type === 'IncludeFilter'));
 
   if (before) {
     var result = before(ast, replace);
@@ -105,7 +108,7 @@ function walkAST(ast, before, after, options) {
   return ast;
 
   function walkAndMergeNodes(nodes) {
-    return nodes.reduce(function (nodes, node) {
+    return nodes.reduce(function(nodes, node) {
       var result = walkAST(node, before, after, options);
       if (Array.isArray(result)) {
         return nodes.concat(result);
diff --git a/packages/pug-walk/test/index.test.js b/packages/pug-walk/test/index.test.js
index 7881da99e..70c4698f9 100644
--- a/packages/pug-walk/test/index.test.js
+++ b/packages/pug-walk/test/index.test.js
@@ -5,83 +5,91 @@ var lex = require('pug-lexer');
 var parse = require('pug-parser');
 var walk = require('../');
 
-test('simple', function () {
-  var ast = walk(parse(lex('.my-class foo')), function before(node, replace) {
-    // called before walking the children of `node`
-    // to replace the node, call `replace(newNode)`
-    // return `false` to skip descending
-    if (node.type === 'Text') {
-      replace({
-        type: 'Text',
-        val: 'bar',
-        line: node.line,
-        column: node.column
-      });
+test('simple', function() {
+  var ast = walk(
+    parse(lex('.my-class foo')),
+    function before(node, replace) {
+      // called before walking the children of `node`
+      // to replace the node, call `replace(newNode)`
+      // return `false` to skip descending
+      if (node.type === 'Text') {
+        replace({
+          type: 'Text',
+          val: 'bar',
+          line: node.line,
+          column: node.column,
+        });
+      }
+    },
+    function after(node, replace) {
+      // called before walking the children of `node`
+      // to replace the node, call `replace(newNode)`
     }
-  }, function after(node, replace) {
-    // called before walking the children of `node`
-    // to replace the node, call `replace(newNode)`
-  });
+  );
   expect(ast).toEqual(parse(lex('.my-class bar')));
 });
 
-describe('replace([])', function () {
-  test('block flattening', function () {
+describe('replace([])', function() {
+  test('block flattening', function() {
     var called = [];
-    var ast = walk({
-      type: 'Block',
-      nodes: [
-        {
-          type: 'Block',
-          nodes: [
-            {
-              type: 'Block',
-              nodes: [
-                {
-                  type: 'Text',
-                  val: 'a'
-                },
-                {
-                  type: 'Text',
-                  val: 'b'
-                }
-              ]
-            },
-            {
-              type: 'Text',
-              val: 'c'
-            }
-          ]
-        },
-        {
-          type: 'Text',
-          val: 'd'
+    var ast = walk(
+      {
+        type: 'Block',
+        nodes: [
+          {
+            type: 'Block',
+            nodes: [
+              {
+                type: 'Block',
+                nodes: [
+                  {
+                    type: 'Text',
+                    val: 'a',
+                  },
+                  {
+                    type: 'Text',
+                    val: 'b',
+                  },
+                ],
+              },
+              {
+                type: 'Text',
+                val: 'c',
+              },
+            ],
+          },
+          {
+            type: 'Text',
+            val: 'd',
+          },
+        ],
+      },
+      function(node, replace) {
+        if (node.type === 'Text') {
+          called.push('before ' + node.val);
+          if (node.val === 'a') {
+            assert(replace.arrayAllowed, 'replace.arrayAllowed set wrongly');
+            replace([
+              {
+                type: 'Text',
+                val: 'e',
+              },
+              {
+                type: 'Text',
+                val: 'f',
+              },
+            ]);
+          }
         }
-      ]
-    }, function (node, replace) {
-      if (node.type === 'Text') {
-        called.push('before ' + node.val);
-        if (node.val === 'a') {
-          assert(replace.arrayAllowed, 'replace.arrayAllowed set wrongly');
-          replace([
-            {
-              type: 'Text',
-              val: 'e'
-            },
-            {
-              type: 'Text',
-              val: 'f'
-            }
-          ]);
+      },
+      function(node, replace) {
+        if (node.type === 'Block' && replace.arrayAllowed) {
+          replace(node.nodes);
+        } else if (node.type === 'Text') {
+          called.push('after ' + node.val);
         }
       }
-    }, function (node, replace) {
-      if (node.type === 'Block' && replace.arrayAllowed) {
-        replace(node.nodes);
-      } else if (node.type === 'Text') {
-        called.push('after ' + node.val);
-      }
-    });
+    );
 
     expect(ast).toEqual({
       type: 'Block',
@@ -90,32 +98,39 @@ describe('replace([])', function () {
         {type: 'Text', val: 'f'},
         {type: 'Text', val: 'b'},
         {type: 'Text', val: 'c'},
-        {type: 'Text', val: 'd'}
-      ]
+        {type: 'Text', val: 'd'},
+      ],
     });
 
-    assert.deepEqual(called, [
-      'before a',
+    assert.deepEqual(
+      called,
+      [
+        'before a',
 
-      'before e',
-      'after e',
+        'before e',
+        'after e',
 
-      'before f',
-      'after f',
+        'before f',
+        'after f',
 
-      'before b',
-      'after b',
+        'before b',
+        'after b',
 
-      'before c',
-      'after c',
+        'before c',
+        'after c',
 
-      'before d',
-      'after d'
-    ], 'before() and after() called incorrectly: ' + JSON.stringify(called));
+        'before d',
+        'after d',
+      ],
+      'before() and after() called incorrectly: ' + JSON.stringify(called)
+    );
   });
 
-  test('adding include filters', function () {
-    var ast = walk(parse(lex('include:filter1:filter2 file')), function (node, replace) {
+  test('adding include filters', function() {
+    var ast = walk(parse(lex('include:filter1:filter2 file')), function(
+      node,
+      replace
+    ) {
       if (node.type === 'IncludeFilter') {
         assert(replace.arrayAllowed);
         if (node.name === 'filter1') {
@@ -127,15 +142,15 @@ describe('replace([])', function () {
               name: firstFilter,
               attrs: [],
               line: node.line,
-              column: node.column
+              column: node.column,
             },
             {
               type: 'IncludeFilter',
               name: 'filter4',
               attrs: [],
               line: node.line,
-              column: node.column + firstFilter.length + 1
-            }
+              column: node.column + firstFilter.length + 1,
+            },
           ]);
         } else if (node.name === 'filter2') {
           replace([]);
@@ -146,11 +161,15 @@ describe('replace([])', function () {
     expect(ast).toEqual(parse(lex('include:filter3:filter4 file')));
   });
 
-  test('fails when parent is not Block', function () {
-    walk(parse(lex('p content')), function (node, replace) {
-      if (node.type === 'Block' && node.nodes[0] && node.nodes[0].type === 'Text') {
+  test('fails when parent is not Block', function() {
+    walk(parse(lex('p content')), function(node, replace) {
+      if (
+        node.type === 'Block' &&
+        node.nodes[0] &&
+        node.nodes[0].type === 'Text'
+      ) {
         assert(!replace.arrayAllowed, 'replace.arrayAllowed set wrongly');
-        assert.throws(function () {
+        assert.throws(function() {
           replace([]);
         });
       }
diff --git a/packages/pug/examples/attributes.js b/packages/pug/examples/attributes.js
index ba5cc9931..7744e1ae2 100644
--- a/packages/pug/examples/attributes.js
+++ b/packages/pug/examples/attributes.js
@@ -1,11 +1,10 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/attributes.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/attributes.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
-console.log(fn({ name: 'tj' }));
\ No newline at end of file
+console.log(fn({name: 'tj'}));
diff --git a/packages/pug/examples/code.js b/packages/pug/examples/code.js
index d797ce537..6d16bc788 100644
--- a/packages/pug/examples/code.js
+++ b/packages/pug/examples/code.js
@@ -1,16 +1,15 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/code.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/code.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
 var users = {
-  tj: { age: 23, email: 'tj@vision-media.ca', isA: 'human' },
-  tobi: { age: 1, email: 'tobi@is-amazing.com', isA: 'ferret' }
+  tj: {age: 23, email: 'tj@vision-media.ca', isA: 'human'},
+  tobi: {age: 1, email: 'tobi@is-amazing.com', isA: 'ferret'},
 };
 
-console.log(fn({ users: users }));
\ No newline at end of file
+console.log(fn({users: users}));
diff --git a/packages/pug/examples/dynamicscript.js b/packages/pug/examples/dynamicscript.js
index 21958a85e..a0d2739d8 100644
--- a/packages/pug/examples/dynamicscript.js
+++ b/packages/pug/examples/dynamicscript.js
@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */
@@ -7,9 +6,9 @@ var pug = require('../');
 
 var locals = {
   users: {
-    tj: { age: 23, email: 'tj@vision-media.ca', isA: 'human' },
-    tobi: { age: 1, email: 'tobi@is-amazing.com', isA: 'ferret' }
-  }
+    tj: {age: 23, email: 'tj@vision-media.ca', isA: 'human'},
+    tobi: {age: 1, email: 'tobi@is-amazing.com', isA: 'ferret'},
+  },
 };
 
 var fn = pug.compileFile(__dirname + '/dynamicscript.pug');
diff --git a/packages/pug/examples/each.js b/packages/pug/examples/each.js
index 53bac827a..d5a864ca3 100644
--- a/packages/pug/examples/each.js
+++ b/packages/pug/examples/each.js
@@ -1,16 +1,15 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/each.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/each.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
 var users = {
-  tj: { age: 23, email: 'tj@vision-media.ca', isA: 'human' },
-  tobi: { age: 1, email: 'tobi@is-amazing.com', isA: 'ferret' }
+  tj: {age: 23, email: 'tj@vision-media.ca', isA: 'human'},
+  tobi: {age: 1, email: 'tobi@is-amazing.com', isA: 'ferret'},
 };
 
-console.log(fn({ users: users }));
\ No newline at end of file
+console.log(fn({users: users}));
diff --git a/packages/pug/examples/extend.js b/packages/pug/examples/extend.js
index 6adc86f1e..5aed4147d 100644
--- a/packages/pug/examples/extend.js
+++ b/packages/pug/examples/extend.js
@@ -1,18 +1,19 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/extend.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/extend.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
-var tobi = { name: 'tobi', age: 2 };
-var loki = { name: 'loki', age: 1 };
-var jane = { name: 'jane', age: 5 };
+var tobi = {name: 'tobi', age: 2};
+var loki = {name: 'loki', age: 1};
+var jane = {name: 'jane', age: 5};
 
-console.log(fn({
-    title: 'pets'
-  , pets: [tobi, loki, jane]
-}));
\ No newline at end of file
+console.log(
+  fn({
+    title: 'pets',
+    pets: [tobi, loki, jane],
+  })
+);
diff --git a/packages/pug/examples/form.js b/packages/pug/examples/form.js
index e706c47b1..3d888534e 100644
--- a/packages/pug/examples/form.js
+++ b/packages/pug/examples/form.js
@@ -1,18 +1,17 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/form.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/form.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
 var user = {
   name: 'TJ',
   email: 'tj@vision-media.ca',
   city: 'Victoria',
-  province: 'BC'
+  province: 'BC',
 };
 
-console.log(fn({ user: user }));
\ No newline at end of file
+console.log(fn({user: user}));
diff --git a/packages/pug/examples/includes.js b/packages/pug/examples/includes.js
index e2dfe0e23..5ea1a5945 100644
--- a/packages/pug/examples/includes.js
+++ b/packages/pug/examples/includes.js
@@ -1,11 +1,10 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/includes.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/includes.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
-console.log(fn());
\ No newline at end of file
+console.log(fn());
diff --git a/packages/pug/examples/layout-debug.js b/packages/pug/examples/layout-debug.js
index 1a3d6199a..3e4dd9387 100644
--- a/packages/pug/examples/layout-debug.js
+++ b/packages/pug/examples/layout-debug.js
@@ -1,11 +1,10 @@
-
 /**
  * Module dependencies.
  */
 
 var pug = require('../');
 
-pug.renderFile(__dirname + '/layout.pug', { debug: true }, function(err, html){
-    if (err) throw err;
-    console.log(html);
+pug.renderFile(__dirname + '/layout.pug', {debug: true}, function(err, html) {
+  if (err) throw err;
+  console.log(html);
 });
diff --git a/packages/pug/examples/layout.js b/packages/pug/examples/layout.js
index 347b4c80c..fc56d2ecc 100644
--- a/packages/pug/examples/layout.js
+++ b/packages/pug/examples/layout.js
@@ -1,11 +1,10 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/layout.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/layout.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
-console.log(fn());
\ No newline at end of file
+console.log(fn());
diff --git a/packages/pug/examples/mixins.js b/packages/pug/examples/mixins.js
index e6f29048a..349c600df 100644
--- a/packages/pug/examples/mixins.js
+++ b/packages/pug/examples/mixins.js
@@ -1,16 +1,15 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/mixins.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/mixins.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
 var user = {
-    name: 'tj'
-  , pets: ['tobi', 'loki', 'jane', 'manny']
+  name: 'tj',
+  pets: ['tobi', 'loki', 'jane', 'manny'],
 };
 
-console.log(fn({ user: user }));
\ No newline at end of file
+console.log(fn({user: user}));
diff --git a/packages/pug/examples/rss.js b/packages/pug/examples/rss.js
index 6b34fc8e1..4c6447129 100644
--- a/packages/pug/examples/rss.js
+++ b/packages/pug/examples/rss.js
@@ -1,17 +1,28 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/rss.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/rss.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
 var items = [];
 
-items.push({ title: 'Example', description: 'Something', link: 'http://google.com' });
-items.push({ title: 'LearnBoost', description: 'Cool', link: 'http://learnboost.com' });
-items.push({ title: 'Express', description: 'Cool', link: 'http://expressjs.com' });
+items.push({
+  title: 'Example',
+  description: 'Something',
+  link: 'http://google.com',
+});
+items.push({
+  title: 'LearnBoost',
+  description: 'Cool',
+  link: 'http://learnboost.com',
+});
+items.push({
+  title: 'Express',
+  description: 'Cool',
+  link: 'http://expressjs.com',
+});
 
-console.log(fn({ items: items }));
\ No newline at end of file
+console.log(fn({items: items}));
diff --git a/packages/pug/examples/text.js b/packages/pug/examples/text.js
index 563486127..7fe4f696d 100644
--- a/packages/pug/examples/text.js
+++ b/packages/pug/examples/text.js
@@ -1,11 +1,10 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/text.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/text.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
-console.log(fn({ name: 'tj', email: 'tj@vision-media.ca' }));
\ No newline at end of file
+console.log(fn({name: 'tj', email: 'tj@vision-media.ca'}));
diff --git a/packages/pug/examples/whitespace.js b/packages/pug/examples/whitespace.js
index 54a2ea265..badd77ec7 100644
--- a/packages/pug/examples/whitespace.js
+++ b/packages/pug/examples/whitespace.js
@@ -1,11 +1,10 @@
-
 /**
  * Module dependencies.
  */
 
-var pug = require('../')
-  , path = __dirname + '/whitespace.pug'
-  , str = require('fs').readFileSync(path, 'utf8')
-  , fn = pug.compile(str, { filename: path, pretty: true });
+var pug = require('../'),
+  path = __dirname + '/whitespace.pug',
+  str = require('fs').readFileSync(path, 'utf8'),
+  fn = pug.compile(str, {filename: path, pretty: true});
 
-console.log(fn());
\ No newline at end of file
+console.log(fn());
diff --git a/packages/pug/lib/index.js b/packages/pug/lib/index.js
index 2d9b16c9c..ec734f7bb 100644
--- a/packages/pug/lib/index.js
+++ b/packages/pug/lib/index.js
@@ -41,17 +41,13 @@ exports.runtime = runtime;
 exports.cache = {};
 
 function applyPlugins(value, options, plugins, name) {
-  return plugins.reduce(function (value, plugin) {
-    return (
-      plugin[name]
-      ? plugin[name](value, options)
-      : value
-    );
+  return plugins.reduce(function(value, plugin) {
+    return plugin[name] ? plugin[name](value, options) : value;
   }, value);
 }
 
 function findReplacementFunc(plugins, name) {
-  var eligiblePlugins = plugins.filter(function (plugin) {
+  var eligiblePlugins = plugins.filter(function(plugin) {
     return plugin[name];
   });
 
@@ -78,7 +74,7 @@ exports.filters = {};
  * @api private
  */
 
-function compileBody(str, options){
+function compileBody(str, options) {
   var debug_sources = {};
   debug_sources[options.filename] = str;
   var dependencies = [];
@@ -86,26 +82,38 @@ function compileBody(str, options){
   var ast = load.string(str, {
     filename: options.filename,
     basedir: options.basedir,
-    lex: function (str, options) {
+    lex: function(str, options) {
       var lexOptions = {};
-      Object.keys(options).forEach(function (key) {
+      Object.keys(options).forEach(function(key) {
         lexOptions[key] = options[key];
       });
-      lexOptions.plugins = plugins.filter(function (plugin) {
-        return !!plugin.lex;
-      }).map(function (plugin) {
-        return plugin.lex;
-      });
-      var contents = applyPlugins(str, {filename: options.filename}, plugins, 'preLex');
-      return applyPlugins(lex(contents, lexOptions), options, plugins, 'postLex');
+      lexOptions.plugins = plugins
+        .filter(function(plugin) {
+          return !!plugin.lex;
+        })
+        .map(function(plugin) {
+          return plugin.lex;
+        });
+      var contents = applyPlugins(
+        str,
+        {filename: options.filename},
+        plugins,
+        'preLex'
+      );
+      return applyPlugins(
+        lex(contents, lexOptions),
+        options,
+        plugins,
+        'postLex'
+      );
     },
-    parse: function (tokens, options) {
-      tokens = tokens.map(function (token) {
+    parse: function(tokens, options) {
+      tokens = tokens.map(function(token) {
         if (token.type === 'path' && path.extname(token.val) === '') {
           return {
             type: 'path',
             loc: token.loc,
-            val: token.val + '.pug'
+            val: token.val + '.pug',
           };
         }
         return token;
@@ -113,21 +121,30 @@ function compileBody(str, options){
       tokens = stripComments(tokens, options);
       tokens = applyPlugins(tokens, options, plugins, 'preParse');
       var parseOptions = {};
-      Object.keys(options).forEach(function (key) {
+      Object.keys(options).forEach(function(key) {
         parseOptions[key] = options[key];
       });
-      parseOptions.plugins = plugins.filter(function (plugin) {
-        return !!plugin.parse;
-      }).map(function (plugin) {
-        return plugin.parse;
-      });
+      parseOptions.plugins = plugins
+        .filter(function(plugin) {
+          return !!plugin.parse;
+        })
+        .map(function(plugin) {
+          return plugin.parse;
+        });
 
       return applyPlugins(
-        applyPlugins(parse(tokens, parseOptions), options, plugins, 'postParse'),
-        options, plugins, 'preLoad'
+        applyPlugins(
+          parse(tokens, parseOptions),
+          options,
+          plugins,
+          'postParse'
+        ),
+        options,
+        plugins,
+        'preLoad'
       );
     },
-    resolve: function (filename, source, loadOptions) {
+    resolve: function(filename, source, loadOptions) {
       var replacementFunc = findReplacementFunc(plugins, 'resolve');
       if (replacementFunc) {
         return replacementFunc(filename, source, options);
@@ -135,7 +152,7 @@ function compileBody(str, options){
 
       return load.resolve(filename, source, loadOptions);
     },
-    read: function (filename, loadOptions) {
+    read: function(filename, loadOptions) {
       dependencies.push(filename);
 
       var contents;
@@ -149,21 +166,26 @@ function compileBody(str, options){
 
       debug_sources[filename] = contents;
       return contents;
-    }
+    },
   });
   ast = applyPlugins(ast, options, plugins, 'postLoad');
   ast = applyPlugins(ast, options, plugins, 'preFilters');
 
   var filtersSet = {};
-  Object.keys(exports.filters).forEach(function (key) {
+  Object.keys(exports.filters).forEach(function(key) {
     filtersSet[key] = exports.filters[key];
   });
   if (options.filters) {
-    Object.keys(options.filters).forEach(function (key) {
+    Object.keys(options.filters).forEach(function(key) {
       filtersSet[key] = options.filters[key];
     });
   }
-  ast = filters.handleFilters(ast, filtersSet, options.filterOptions, options.filterAliases);
+  ast = filters.handleFilters(
+    ast,
+    filtersSet,
+    options.filterOptions,
+    options.filterAliases
+  );
 
   ast = applyPlugins(ast, options, plugins, 'postFilters');
   ast = applyPlugins(ast, options, plugins, 'preLink');
@@ -180,13 +202,16 @@ function compileBody(str, options){
     globals: options.globals,
     self: options.self,
     includeSources: options.includeSources ? debug_sources : false,
-    templateName: options.templateName
+    templateName: options.templateName,
   });
   js = applyPlugins(js, options, plugins, 'postCodeGen');
 
   // Debug compiler
   if (options.debug) {
-    console.error('\nCompiled Function:\n\n\u001b[90m%s\u001b[0m', js.replace(/^/gm, '  '));
+    console.error(
+      '\nCompiled Function:\n\n\u001b[90m%s\u001b[0m',
+      js.replace(/^/gm, '  ')
+    );
   }
 
   return {body: js, dependencies: dependencies};
@@ -206,7 +231,7 @@ function compileBody(str, options){
  * @return {Function}
  * @api private
  */
-function handleTemplateCache (options, str) {
+function handleTemplateCache(options, str) {
   var key = options.filename;
   if (options.cache && exports.cache[key]) {
     return exports.cache[key];
@@ -234,8 +259,8 @@ function handleTemplateCache (options, str) {
  * @api public
  */
 
-exports.compile = function(str, options){
-  var options = options || {}
+exports.compile = function(str, options) {
+  var options = options || {};
 
   str = String(str);
 
@@ -283,7 +308,7 @@ exports.compile = function(str, options){
  * @api public
  */
 
-exports.compileClientWithDependenciesTracked = function(str, options){
+exports.compileClientWithDependenciesTracked = function(str, options) {
   var options = options || {};
 
   str = String(str);
@@ -302,13 +327,13 @@ exports.compileClientWithDependenciesTracked = function(str, options){
     filters: options.filters,
     filterOptions: options.filterOptions,
     filterAliases: options.filterAliases,
-    plugins: options.plugins
+    plugins: options.plugins,
   });
 
   var body = parsed.body;
 
-  if(options.module) {
-    if(options.inlineRuntimeFunctions === false) {
+  if (options.module) {
+    if (options.inlineRuntimeFunctions === false) {
       body = 'var pug = require("pug-runtime");' + body;
     }
     body += ' module.exports = ' + (options.name || 'template') + ';';
@@ -332,7 +357,7 @@ exports.compileClientWithDependenciesTracked = function(str, options){
  * @return {String}
  * @api public
  */
-exports.compileClient = function (str, options) {
+exports.compileClient = function(str, options) {
   return exports.compileClientWithDependenciesTracked(str, options).body;
 };
 
@@ -350,7 +375,7 @@ exports.compileClient = function (str, options) {
  * @return {Function}
  * @api public
  */
-exports.compileFile = function (path, options) {
+exports.compileFile = function(path, options) {
   options = options || {};
   options.filename = path;
   return handleTemplateCache(options);
@@ -371,10 +396,10 @@ exports.compileFile = function (path, options) {
  * @api public
  */
 
-exports.render = function(str, options, fn){
+exports.render = function(str, options, fn) {
   // support callback API
   if ('function' == typeof options) {
-    fn = options, options = undefined;
+    (fn = options), (options = undefined);
   }
   if (typeof fn === 'function') {
     var res;
@@ -406,10 +431,10 @@ exports.render = function(str, options, fn){
  * @api public
  */
 
-exports.renderFile = function(path, options, fn){
+exports.renderFile = function(path, options, fn) {
   // support callback API
   if ('function' == typeof options) {
-    fn = options, options = undefined;
+    (fn = options), (options = undefined);
   }
   if (typeof fn === 'function') {
     var res;
@@ -427,7 +452,6 @@ exports.renderFile = function(path, options, fn){
   return handleTemplateCache(options)(options);
 };
 
-
 /**
  * Compile a Pug file at the given `path` for use on the client.
  *
@@ -437,7 +461,7 @@ exports.renderFile = function(path, options, fn){
  * @api public
  */
 
-exports.compileFileClient = function(path, options){
+exports.compileFileClient = function(path, options) {
   var key = path + ':client';
   options = options || {};
 
@@ -458,8 +482,11 @@ exports.compileFileClient = function(path, options){
  */
 
 exports.__express = function(path, options, fn) {
-  if(options.compileDebug == undefined && process.env.NODE_ENV === 'production') {
+  if (
+    options.compileDebug == undefined &&
+    process.env.NODE_ENV === 'production'
+  ) {
     options.compileDebug = false;
   }
   exports.renderFile(path, options, fn);
-}
+};
diff --git a/packages/pug/register.js b/packages/pug/register.js
index 02f218d57..3f7b57520 100644
--- a/packages/pug/register.js
+++ b/packages/pug/register.js
@@ -2,12 +2,19 @@ var pug = require('./');
 var resolvedPug = JSON.stringify(require.resolve('./'));
 
 function compileTemplate(module, filename) {
-  var template = pug.compileFileClient(filename, {inlineRuntimeFunctions: false});
-  var body = "var pug = require(" + resolvedPug + ").runtime;\n\n" +
-             "module.exports = " + template + ";";
+  var template = pug.compileFileClient(filename, {
+    inlineRuntimeFunctions: false,
+  });
+  var body =
+    'var pug = require(' +
+    resolvedPug +
+    ').runtime;\n\n' +
+    'module.exports = ' +
+    template +
+    ';';
   module._compile(body, filename);
 }
 
 if (require.extensions) {
-  require.extensions['.pug'] = compileTemplate
-};
+  require.extensions['.pug'] = compileTemplate;
+}
diff --git a/packages/pug/support/benchmark.js b/packages/pug/support/benchmark.js
index 4782f430a..f47009670 100644
--- a/packages/pug/support/benchmark.js
+++ b/packages/pug/support/benchmark.js
@@ -1,34 +1,33 @@
-
 /**
  * Module dependencies.
  */
 
-var uubench = require('uubench')
-  , pug = require('../');
-
+var uubench = require('uubench'),
+  pug = require('../');
 
 var suite = new uubench.Suite({
   min: 200,
-  result: function(name, stats){
-    var persec = 1000 / stats.elapsed
-      , ops = stats.iterations * persec;
+  result: function(name, stats) {
+    var persec = 1000 / stats.elapsed,
+      ops = stats.iterations * persec;
     console.log('%s: %d', name, ops | 0);
-  }
+  },
 });
 
 function setup(self) {
-  var suffix = self ? ' (self)' : ''
-    , options = { self: self };
+  var suffix = self ? ' (self)' : '',
+    options = {self: self};
 
-  var str = 'html\n  body\n    h1 Title'
-    , fn = pug.compile(str, options);
+  var str = 'html\n  body\n    h1 Title',
+    fn = pug.compile(str, options);
 
-  suite.bench('tiny' + suffix, function(next){
+  suite.bench('tiny' + suffix, function(next) {
     fn();
     next();
   });
 
-str = '\
+  str =
+    '\
 html\n\
   body\n\
     h1 Title\n\
@@ -42,12 +41,13 @@ html\n\
 
   var fn2 = pug.compile(str, options);
 
-  suite.bench('small' + suffix, function(next){
+  suite.bench('small' + suffix, function(next) {
     fn2();
     next();
   });
 
-str = '\
+  str =
+    '\
 html\n\
   body\n\
     h1 #{title}\n\
@@ -57,7 +57,8 @@ html\n\
 ';
 
   if (self) {
-str = '\
+    str =
+      '\
 html\n\
   body\n\
     h1 #{self.title}\n\
@@ -69,12 +70,16 @@ html\n\
 
   var fn3 = pug.compile(str, options);
 
-  suite.bench('small locals' + suffix, function(next){
-    fn3({ title: 'Title', links: ['Home', 'About Us', 'Store', 'FAQ', 'Contact'] });
+  suite.bench('small locals' + suffix, function(next) {
+    fn3({
+      title: 'Title',
+      links: ['Home', 'About Us', 'Store', 'FAQ', 'Contact'],
+    });
     next();
   });
 
-str = '\
+  str =
+    '\
 html\n\
   body\n\
     h1 Title\n\
@@ -89,12 +94,13 @@ html\n\
   str = Array(30).join(str);
   var fn4 = pug.compile(str, options);
 
-  suite.bench('medium' + suffix, function(next){
+  suite.bench('medium' + suffix, function(next) {
     fn4();
     next();
   });
 
-str = '\
+  str =
+    '\
 html\n\
   body\n\
     h1 Title\n\
@@ -109,7 +115,7 @@ html\n\
   str = Array(100).join(str);
   var fn5 = pug.compile(str, options);
 
-  suite.bench('large' + suffix, function(next){
+  suite.bench('large' + suffix, function(next) {
     fn5();
     next();
   });
@@ -118,4 +124,4 @@ html\n\
 setup();
 setup(true);
 
-suite.run();
\ No newline at end of file
+suite.run();
diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
index 0ce7c83c5..622f468a2 100644
--- a/packages/pug/test/__snapshots__/pug.test.js.snap
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -56,29 +56,31 @@ exports[`pug .compileClient() should support module syntax in pug.compileClient(
   return c !== r ? s + a.substring(c, r) : s;
 }
 var pug_match_html = /[\\"&<>]/;
-function pug_rethrow(n, e, r, t) {
+function pug_rethrow(n, e, t, r) {
   if (!(n instanceof Error)) throw n;
-  if (!(('undefined' == typeof window && e) || t))
-    throw ((n.message += ' on line ' + r), n);
+  if (!(('undefined' == typeof window && e) || r))
+    throw ((n.message += ' on line ' + t), n);
   try {
-    t = t || require('fs').readFileSync(e, 'utf8');
+    r = r || require('fs').readFileSync(e, 'utf8');
   } catch (e) {
-    pug_rethrow(n, null, r);
+    pug_rethrow(n, null, t);
   }
-  var i = 3,
-    a = t.split('\\\\n'),
-    o = Math.max(r - i, 0),
-    h = Math.min(a.length, r + i),
-    i = a
+  var a = 3,
+    i = r.split('\\\\n'),
+    o = Math.max(t - a, 0),
+    h = Math.min(i.length, t + a),
+    a = i
       .slice(o, h)
       .map(function(n, e) {
-        var t = e + o + 1;
-        return (t == r ? '  > ' : '    ') + t + '| ' + n;
+        var r = e + o + 1;
+        return (r == t ? '  > ' : '    ') + r + '| ' + n;
       })
       .join('\\\\n');
-  throw ((n.path = e),
-  (n.message = (e || 'Pug') + ':' + r + '\\\\n' + i + '\\\\n\\\\n' + n.message),
-  n);
+  n.path = e;
+  try {
+    n.message = (e || 'Pug') + ':' + t + '\\\\n' + a + '\\\\n\\\\n' + n.message;
+  } catch (n) {}
+  throw n;
 }
 function template(locals) {
   var pug_html = '',
diff --git a/packages/pug/test/cases/auxiliary/includable.js b/packages/pug/test/cases/auxiliary/includable.js
index f3efe1e66..38c071e0c 100644
--- a/packages/pug/test/cases/auxiliary/includable.js
+++ b/packages/pug/test/cases/auxiliary/includable.js
@@ -1,7 +1,8 @@
-var STRING_SUBSTITUTIONS = {    // table of character substitutions
+var STRING_SUBSTITUTIONS = {
+  // table of character substitutions
   '\t': '\\t',
   '\r': '\\r',
   '\n': '\\n',
-  '"' : '\\"',
-  '\\': '\\\\'
-};
\ No newline at end of file
+  '"': '\\"',
+  '\\': '\\\\',
+};
diff --git a/packages/pug/test/cases/includes-with-ext-js.html b/packages/pug/test/cases/includes-with-ext-js.html
index c36c3633d..26c9184e7 100644
--- a/packages/pug/test/cases/includes-with-ext-js.html
+++ b/packages/pug/test/cases/includes-with-ext-js.html
@@ -1,2 +1,2 @@
-<pre><code>var x = "\n here is some \n new lined text";
+<pre><code>var x = '\n here is some \n new lined text';
 </code></pre>
diff --git a/packages/pug/test/cases/includes.html b/packages/pug/test/cases/includes.html
index 2c004300a..eb61d5c8b 100644
--- a/packages/pug/test/cases/includes.html
+++ b/packages/pug/test/cases/includes.html
@@ -4,13 +4,15 @@
   console.log("foo\nbar")
 </script>
   <script type="text/javascript">
-var STRING_SUBSTITUTIONS = {    // table of character substitutions
+var STRING_SUBSTITUTIONS = {
+  // table of character substitutions
   '\t': '\\t',
   '\r': '\\r',
   '\n': '\\n',
-  '"' : '\\"',
-  '\\': '\\\\'
+  '"': '\\"',
+  '\\': '\\\\',
 };
 
+
   </script>
 </body>
\ No newline at end of file
diff --git a/packages/pug/test/cases/javascript-new-lines.js b/packages/pug/test/cases/javascript-new-lines.js
index 6893341c5..bb0c26f05 100644
--- a/packages/pug/test/cases/javascript-new-lines.js
+++ b/packages/pug/test/cases/javascript-new-lines.js
@@ -1 +1 @@
-var x = "\n here is some \n new lined text";
+var x = '\n here is some \n new lined text';
diff --git a/packages/pug/test/duplicate-block/index.test.js b/packages/pug/test/duplicate-block/index.test.js
index 99161340c..d77631f87 100644
--- a/packages/pug/test/duplicate-block/index.test.js
+++ b/packages/pug/test/duplicate-block/index.test.js
@@ -1,14 +1,10 @@
 const pug = require('../../');
 
 test('layout with duplicate block', () => {
-  const outputWithAjax = pug.renderFile(
-    __dirname + '/index.pug',
-    {ajax: true}
-  );
-  const outputWithoutAjax = pug.renderFile(
-    __dirname + '/index.pug',
-    {ajax: false}
-  );
+  const outputWithAjax = pug.renderFile(__dirname + '/index.pug', {ajax: true});
+  const outputWithoutAjax = pug.renderFile(__dirname + '/index.pug', {
+    ajax: false,
+  });
   expect(outputWithAjax).toMatchSnapshot();
   expect(outputWithoutAjax).toMatchSnapshot();
 });
diff --git a/packages/pug/test/eachOf/index.test.js b/packages/pug/test/eachOf/index.test.js
index 5faf59f34..69da0bae3 100644
--- a/packages/pug/test/eachOf/index.test.js
+++ b/packages/pug/test/eachOf/index.test.js
@@ -2,51 +2,43 @@ const pug = require('../../');
 
 describe('Inproper Usage', () => {
   test('Only left-side bracket', () => {
-    expect(
-      () => pug.compileFile(
-        __dirname + '/error/left-side.pug'
-      )
-    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
-  })
+    expect(() => pug.compileFile(__dirname + '/error/left-side.pug')).toThrow(
+      'The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).'
+    );
+  });
   test('Only right-side bracket', () => {
-    expect(
-      () => pug.compileFile(
-        __dirname + '/error/right-side.pug'
-      )
-    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
-  })
+    expect(() => pug.compileFile(__dirname + '/error/right-side.pug')).toThrow(
+      'The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).'
+    );
+  });
   test('Only one value inside brackets', () => {
-    expect(
-      () => pug.compileFile(
-        __dirname + '/error/one-val.pug'
-      )
-    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
-  })
+    expect(() => pug.compileFile(__dirname + '/error/one-val.pug')).toThrow(
+      'The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).'
+    );
+  });
   test('No brackets', () => {
-    expect(
-      () => pug.compileFile(
-        __dirname + '/error/no-brackets.pug'
-      )
-    ).toThrow('The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).');
-  })
-})
+    expect(() => pug.compileFile(__dirname + '/error/no-brackets.pug')).toThrow(
+      'The value variable for each must either be a valid identifier (e.g. `item`) or a pair of identifiers in square brackets (e.g. `[key, value]`).'
+    );
+  });
+});
 describe('Proper Usage', () => {
   test('Brackets', () => {
-    const html = pug.renderFile(
-      __dirname + '/passing/brackets.pug',
-      {
-        users: new Map([['a', 'b'], ['foo', 'bar']])
-      }
-    )
+    const html = pug.renderFile(__dirname + '/passing/brackets.pug', {
+      users: new Map([
+        ['a', 'b'],
+        ['foo', 'bar'],
+      ]),
+    });
     expect(html).toMatchSnapshot();
-  })
+  });
   test('No Brackets', () => {
-    const html = pug.renderFile(
-      __dirname + '/passing/no-brackets.pug',
-      {
-        users: new Map([['a', 'b'], ['foo', 'bar']])
-      }
-    )
+    const html = pug.renderFile(__dirname + '/passing/no-brackets.pug', {
+      users: new Map([
+        ['a', 'b'],
+        ['foo', 'bar'],
+      ]),
+    });
     expect(html).toMatchSnapshot();
-  })
-})
+  });
+});
diff --git a/packages/pug/test/error.reporting.test.js b/packages/pug/test/error.reporting.test.js
index dc6dc4558..e378e1f14 100644
--- a/packages/pug/test/error.reporting.test.js
+++ b/packages/pug/test/error.reporting.test.js
@@ -1,4 +1,3 @@
-
 /**
  * Module dependencies.
  */
@@ -9,7 +8,7 @@ var fs = require('fs');
 
 // Shortcut
 
-function getError(str, options){
+function getError(str, options) {
   try {
     pug.render(str, options);
   } catch (ex) {
@@ -17,7 +16,7 @@ function getError(str, options){
   }
   throw new Error('Input was supposed to result in an error.');
 }
-function getFileError(name, options){
+function getFileError(name, options) {
   try {
     pug.renderFile(name, options);
   } catch (ex) {
@@ -26,168 +25,224 @@ function getFileError(name, options){
   throw new Error('Input was supposed to result in an error.');
 }
 
-
-describe('error reporting', function () {
-  describe('compile time errors', function () {
-    describe('with no filename', function () {
-      it('includes detail of where the error was thrown', function () {
-        var err = getError('foo(')
+describe('error reporting', function() {
+  describe('compile time errors', function() {
+    describe('with no filename', function() {
+      it('includes detail of where the error was thrown', function() {
+        var err = getError('foo(');
         expect(err.message).toMatch(/Pug:1/);
         expect(err.message).toMatch(/foo\(/);
       });
     });
-    describe('with a filename', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getError('foo(', {filename: 'test.pug'})
+    describe('with a filename', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getError('foo(', {filename: 'test.pug'});
         expect(err.message).toMatch(/test\.pug:1/);
         expect(err.message).toMatch(/foo\(/);
       });
     });
-    describe('with a layout without block declaration (syntax)', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/compile.with.layout.syntax.error.pug', {})
+    describe('with a layout without block declaration (syntax)', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname + '/fixtures/compile.with.layout.syntax.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/[\\\/]layout.syntax.error.pug:2/);
         expect(err.message).toMatch(/foo\(/);
       });
     });
-    describe('with a layout without block declaration (locals)', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/compile.with.layout.locals.error.pug', {})
+    describe('with a layout without block declaration (locals)', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname + '/fixtures/compile.with.layout.locals.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/[\\\/]layout.locals.error.pug:2/);
         expect(err.message).toMatch(/is not a function/);
       });
     });
-    describe('with a include (syntax)', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/compile.with.include.syntax.error.pug', {})
+    describe('with a include (syntax)', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname + '/fixtures/compile.with.include.syntax.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/[\\\/]include.syntax.error.pug:2/);
         expect(err.message).toMatch(/foo\(/);
       });
     });
-    describe('with a include (locals)', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/compile.with.include.locals.error.pug', {})
+    describe('with a include (locals)', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname + '/fixtures/compile.with.include.locals.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/[\\\/]include.locals.error.pug:2/);
         expect(err.message).toMatch(/foo\(/);
       });
     });
-    describe('with a layout (without block) with an include (syntax)', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/compile.with.layout.with.include.syntax.error.pug', {})
+    describe('with a layout (without block) with an include (syntax)', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname +
+            '/fixtures/compile.with.layout.with.include.syntax.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/[\\\/]include.syntax.error.pug:2/);
         expect(err.message).toMatch(/foo\(/);
       });
     });
-    describe('with a layout (without block) with an include (locals)', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/compile.with.layout.with.include.locals.error.pug', {})
+    describe('with a layout (without block) with an include (locals)', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname +
+            '/fixtures/compile.with.layout.with.include.locals.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/[\\\/]include.locals.error.pug:2/);
         expect(err.message).toMatch(/foo\(/);
       });
     });
-    describe('block that is never actually used', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/invalid-block-in-extends.pug', {});
-        expect(err.message).toMatch(/invalid-block-in-extends.pug:6/);;
-        expect(err.message).toMatch(/content/);;
+    describe('block that is never actually used', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname + '/fixtures/invalid-block-in-extends.pug',
+          {}
+        );
+        expect(err.message).toMatch(/invalid-block-in-extends.pug:6/);
+        expect(err.message).toMatch(/content/);
       });
     });
-    describe('Unexpected character', function () {
-      it('includes details of where the error was thrown', function () {
+    describe('Unexpected character', function() {
+      it('includes details of where the error was thrown', function() {
         var err = getError('ul?', {});
         expect(err.message).toMatch(/unexpected text \"\?\"/);
       });
     });
-    describe('Include filtered', function () {
-      it('includes details of where the error was thrown', function () {
+    describe('Include filtered', function() {
+      it('includes details of where the error was thrown', function() {
         var err = getError('include:verbatim()!', {});
         assert(err.message.indexOf('unexpected text "!"') !== -1);
         var err = getError('include:verbatim ', {});
         assert(err.message.indexOf('missing path for include') !== -1);
       });
     });
-    describe('mixin block followed by a lot of blank lines', function () {
-      it('reports the correct line number', function () {
+    describe('mixin block followed by a lot of blank lines', function() {
+      it('reports the correct line number', function() {
         var err = getError('mixin test\n    block\n\ndiv()Test');
         var line = /Pug\:(\d+)/.exec(err.message);
         assert(line, 'Line number must be included in error message');
-        assert(line[1] === '4', 'The error should be reported on line 4, not line ' + line[1]);
+        assert(
+          line[1] === '4',
+          'The error should be reported on line 4, not line ' + line[1]
+        );
       });
     });
   });
-  describe('runtime errors', function () {
-    describe('with no filename and `compileDebug` left undefined', function () {
-      it('just reports the line number', function () {
+  describe('runtime errors', function() {
+    describe('with no filename and `compileDebug` left undefined', function() {
+      it('just reports the line number', function() {
         var sentinel = new Error('sentinel');
-        var err = getError('-foo()', {foo: function () { throw sentinel; }})
+        var err = getError('-foo()', {
+          foo: function() {
+            throw sentinel;
+          },
+        });
         expect(err.message).toMatch(/on line 1/);
       });
     });
-    describe('with no filename and `compileDebug` set to `true`', function () {
-      it('includes detail of where the error was thrown', function () {
+    describe('with no filename and `compileDebug` set to `true`', function() {
+      it('includes detail of where the error was thrown', function() {
         var sentinel = new Error('sentinel');
-        var err = getError('-foo()', {foo: function () { throw sentinel; }, compileDebug: true})
+        var err = getError('-foo()', {
+          foo: function() {
+            throw sentinel;
+          },
+          compileDebug: true,
+        });
         expect(err.message).toMatch(/Pug:1/);
         expect(err.message).toMatch(/-foo\(\)/);
       });
     });
-    describe('with a filename that does not correspond to a real file and `compileDebug` left undefined', function () {
-      it('just reports the line number', function () {
+    describe('with a filename that does not correspond to a real file and `compileDebug` left undefined', function() {
+      it('just reports the line number', function() {
         var sentinel = new Error('sentinel');
-        var err = getError('-foo()', {foo: function () { throw sentinel; }, filename: 'fake.pug'})
+        var err = getError('-foo()', {
+          foo: function() {
+            throw sentinel;
+          },
+          filename: 'fake.pug',
+        });
         expect(err.message).toMatch(/on line 1/);
       });
     });
-    describe('with a filename that corresponds to a real file and `compileDebug` left undefined', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
+    describe('with a filename that corresponds to a real file and `compileDebug` left undefined', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
         var sentinel = new Error('sentinel');
-        var path = __dirname + '/fixtures/runtime.error.pug'
-        var err = getError(fs.readFileSync(path, 'utf8'), {foo: function () { throw sentinel; }, filename: path})
+        var path = __dirname + '/fixtures/runtime.error.pug';
+        var err = getError(fs.readFileSync(path, 'utf8'), {
+          foo: function() {
+            throw sentinel;
+          },
+          filename: path,
+        });
         expect(err.message).toMatch(/fixtures[\\\/]runtime\.error\.pug:1/);
         expect(err.message).toMatch(/-foo\(\)/);
       });
     });
-    describe('in a mixin', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/runtime.with.mixin.error.pug', {})
+    describe('in a mixin', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname + '/fixtures/runtime.with.mixin.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/mixin.error.pug:2/);
         expect(err.message).toMatch(/Cannot read property 'length' of null/);
       });
     });
-    describe('in a layout', function () {
-      it('includes detail of where the error was thrown including the filename', function () {
-        var err = getFileError(__dirname + '/fixtures/runtime.layout.error.pug', {})
+    describe('in a layout', function() {
+      it('includes detail of where the error was thrown including the filename', function() {
+        var err = getFileError(
+          __dirname + '/fixtures/runtime.layout.error.pug',
+          {}
+        );
         expect(err.message).toMatch(/layout.with.runtime.error.pug:3/);
-        expect(err.message).toMatch(/Cannot read property 'length' of undefined/);
+        expect(err.message).toMatch(
+          /Cannot read property 'length' of undefined/
+        );
       });
     });
   });
-  describe('deprecated features', function () {
-    it('warns about element-with-multiple-attributes', function () {
+  describe('deprecated features', function() {
+    it('warns about element-with-multiple-attributes', function() {
       var consoleWarn = console.warn;
       var log = '';
-      console.warn = function (str) {
+      console.warn = function(str) {
         log += str;
       };
-      var res = pug.renderFile(__dirname + '/fixtures/element-with-multiple-attributes.pug');
+      var res = pug.renderFile(
+        __dirname + '/fixtures/element-with-multiple-attributes.pug'
+      );
       console.warn = consoleWarn;
-      expect(log).toMatch(/element-with-multiple-attributes.pug, line 1:/);;
-      expect(log).toMatch(/You should not have pug tags with multiple attributes/);;
+      expect(log).toMatch(/element-with-multiple-attributes.pug, line 1:/);
+      expect(log).toMatch(
+        /You should not have pug tags with multiple attributes/
+      );
       expect(res).toBe('<div attr="val" foo="bar"></div>');
     });
   });
-  describe('if you throw something that isn\'t an error', function () {
-    it('just rethrows without modification', function () {
+  describe("if you throw something that isn't an error", function() {
+    it('just rethrows without modification', function() {
       var err = getError('- throw "foo"');
       expect(err).toBe('foo');
     });
   });
-  describe('import without a filename for a basedir', function () {
-    it('throws an error', function () {
+  describe('import without a filename for a basedir', function() {
+    it('throws an error', function() {
       var err = getError('include foo.pug');
-      expect(err.message).toMatch(/the "filename" option is required to use/);;
+      expect(err.message).toMatch(/the "filename" option is required to use/);
       var err = getError('include /foo.pug');
-      expect(err.message).toMatch(/the "basedir" option is required to use/);;
-    })
+      expect(err.message).toMatch(/the "basedir" option is required to use/);
+    });
   });
 });
diff --git a/packages/pug/test/examples.test.js b/packages/pug/test/examples.test.js
index 0537f8de3..a4a4c22a1 100644
--- a/packages/pug/test/examples.test.js
+++ b/packages/pug/test/examples.test.js
@@ -3,14 +3,14 @@
 var fs = require('fs');
 var pug = require('../');
 
-describe('examples', function () {
-  fs.readdirSync(__dirname + '/../examples').forEach(function (example) {
+describe('examples', function() {
+  fs.readdirSync(__dirname + '/../examples').forEach(function(example) {
     if (/\.js$/.test(example)) {
-      it(example + ' does not throw any error', function () {
+      it(example + ' does not throw any error', function() {
         var log = console.log;
         var err = console.error;
-        console.log = function () {};
-        console.error = function () {};
+        console.log = function() {};
+        console.error = function() {};
         try {
           require('../examples/' + example);
         } finally {
diff --git a/packages/pug/test/extends-not-top-level/index.test.js b/packages/pug/test/extends-not-top-level/index.test.js
index 43877a026..a0fbf274f 100644
--- a/packages/pug/test/extends-not-top-level/index.test.js
+++ b/packages/pug/test/extends-not-top-level/index.test.js
@@ -3,17 +3,13 @@ const pug = require('../../');
 // regression test for #2404
 
 test('extends not top level should throw an error', () => {
-  expect(
-    () => pug.compileFile(
-      __dirname + '/index.pug'
-    )
-  ).toThrow('Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.');
+  expect(() => pug.compileFile(__dirname + '/index.pug')).toThrow(
+    'Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.'
+  );
 });
 
 test('duplicate extends should throw an error', () => {
-  expect(
-    () => pug.compileFile(
-      __dirname + '/duplicate.pug'
-    )
-  ).toThrow('Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.');
+  expect(() => pug.compileFile(__dirname + '/duplicate.pug')).toThrow(
+    'Declaration of template inheritance ("extends") should be the first thing in the file. There can only be one extends statement per file.'
+  );
 });
diff --git a/packages/pug/test/markdown-it/index.test.js b/packages/pug/test/markdown-it/index.test.js
index 7ab82c8a1..00bef9f96 100644
--- a/packages/pug/test/markdown-it/index.test.js
+++ b/packages/pug/test/markdown-it/index.test.js
@@ -1,13 +1,13 @@
 const pug = require('../../');
 
 test('inline and include markdow-it should match ', () => {
-   const outputMarkdownInline = pug.renderFile(
-      __dirname + '/layout-markdown-inline.pug',
-   );
+  const outputMarkdownInline = pug.renderFile(
+    __dirname + '/layout-markdown-inline.pug'
+  );
 
-   const outputMarkdownIncludes = pug.renderFile(
-      __dirname + '/layout-markdown-include.pug',
-   );
+  const outputMarkdownIncludes = pug.renderFile(
+    __dirname + '/layout-markdown-include.pug'
+  );
 
-   expect(outputMarkdownIncludes).toEqual(outputMarkdownInline);
+  expect(outputMarkdownIncludes).toEqual(outputMarkdownInline);
 });
diff --git a/packages/pug/test/pug.test.js b/packages/pug/test/pug.test.js
index 3327b1a9e..0b4d85274 100644
--- a/packages/pug/test/pug.test.js
+++ b/packages/pug/test/pug.test.js
@@ -5,7 +5,7 @@ var fs = require('fs');
 var path = require('path');
 var pug = require('../');
 
-var perfTest = fs.readFileSync(__dirname + '/fixtures/perf.pug', 'utf8')
+var perfTest = fs.readFileSync(__dirname + '/fixtures/perf.pug', 'utf8');
 
 try {
   fs.mkdirSync(__dirname + '/temp');
@@ -15,267 +15,309 @@ try {
   }
 }
 
-describe('pug', function(){
-
-  describe('unit tests with .render()', function(){
-    it('should support doctypes', function(){
-      assert.equal('<?xml version="1.0" encoding="utf-8" ?>', pug.render('doctype xml'));
+describe('pug', function() {
+  describe('unit tests with .render()', function() {
+    it('should support doctypes', function() {
+      assert.equal(
+        '<?xml version="1.0" encoding="utf-8" ?>',
+        pug.render('doctype xml')
+      );
       assert.equal('<!DOCTYPE html>', pug.render('doctype html'));
       assert.equal('<!DOCTYPE foo bar baz>', pug.render('doctype foo bar baz'));
       assert.equal('<!DOCTYPE html>', pug.render('doctype html'));
-      assert.equal('<!DOCTYPE html>', pug.render('doctype', { doctype:'html' }));
-      assert.equal('<!DOCTYPE html>', pug.render('doctype html', { doctype:'xml' }));
+      assert.equal('<!DOCTYPE html>', pug.render('doctype', {doctype: 'html'}));
+      assert.equal(
+        '<!DOCTYPE html>',
+        pug.render('doctype html', {doctype: 'xml'})
+      );
       assert.equal('<html></html>', pug.render('html'));
-      assert.equal('<!DOCTYPE html><html></html>', pug.render('html', { doctype:'html' }));
-      assert.equal('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN>', pug.render('doctype html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN'));
+      assert.equal(
+        '<!DOCTYPE html><html></html>',
+        pug.render('html', {doctype: 'html'})
+      );
+      assert.equal(
+        '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN>',
+        pug.render('doctype html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN')
+      );
     });
 
-    it('should support Buffers', function(){
+    it('should support Buffers', function() {
       assert.equal('<p>foo</p>', pug.render(Buffer.from('p foo')));
     });
 
-    it('should support line endings', function(){
-      var src = [
-          'p',
-          'div',
-          'img'
-      ];
+    it('should support line endings', function() {
+      var src = ['p', 'div', 'img'];
 
-      var html = [
-          '<p></p>',
-          '<div></div>',
-          '<img/>'
-      ].join('');
+      var html = ['<p></p>', '<div></div>', '<img/>'].join('');
 
       assert.equal(html, pug.render(src.join('\n')));
       assert.equal(html, pug.render(src.join('\r')));
       assert.equal(html, pug.render(src.join('\r\n')));
 
-      html = [
-          '<p></p>',
-          '<div></div>',
-          '<img>'
-      ].join('');
+      html = ['<p></p>', '<div></div>', '<img>'].join('');
 
-      assert.equal(html, pug.render(src.join('\n'), { doctype:'html' }));
-      assert.equal(html, pug.render(src.join('\r'), { doctype:'html' }));
-      assert.equal(html, pug.render(src.join('\r\n'), { doctype:'html' }));
+      assert.equal(html, pug.render(src.join('\n'), {doctype: 'html'}));
+      assert.equal(html, pug.render(src.join('\r'), {doctype: 'html'}));
+      assert.equal(html, pug.render(src.join('\r\n'), {doctype: 'html'}));
     });
 
-    it('should support single quotes', function(){
+    it('should support single quotes', function() {
       assert.equal("<p>'foo'</p>", pug.render("p 'foo'"));
       assert.equal("<p>'foo'</p>", pug.render("p\n  | 'foo'"));
-      assert.equal('<a href="/foo"></a>', pug.render("- var path = 'foo';\na(href='/' + path)"));
+      assert.equal(
+        '<a href="/foo"></a>',
+        pug.render("- var path = 'foo';\na(href='/' + path)")
+      );
     });
 
-    it('should support block-expansion', function(){
-      assert.equal("<li><a>foo</a></li><li><a>bar</a></li><li><a>baz</a></li>", pug.render("li: a foo\nli: a bar\nli: a baz"));
-      assert.equal("<li class=\"first\"><a>foo</a></li><li><a>bar</a></li><li><a>baz</a></li>", pug.render("li.first: a foo\nli: a bar\nli: a baz"));
-      assert.equal('<div class="foo"><div class="bar">baz</div></div>', pug.render(".foo: .bar baz"));
+    it('should support block-expansion', function() {
+      assert.equal(
+        '<li><a>foo</a></li><li><a>bar</a></li><li><a>baz</a></li>',
+        pug.render('li: a foo\nli: a bar\nli: a baz')
+      );
+      assert.equal(
+        '<li class="first"><a>foo</a></li><li><a>bar</a></li><li><a>baz</a></li>',
+        pug.render('li.first: a foo\nli: a bar\nli: a baz')
+      );
+      assert.equal(
+        '<div class="foo"><div class="bar">baz</div></div>',
+        pug.render('.foo: .bar baz')
+      );
     });
 
-    it('should support tags', function(){
-      var str = [
-          'p',
-          'div',
-          'img',
-          'br/'
-      ].join('\n');
+    it('should support tags', function() {
+      var str = ['p', 'div', 'img', 'br/'].join('\n');
 
-      var html = [
-          '<p></p>',
-          '<div></div>',
-          '<img/>',
-          '<br/>'
-      ].join('');
+      var html = ['<p></p>', '<div></div>', '<img/>', '<br/>'].join('');
 
       assert.equal(html, pug.render(str), 'Test basic tags');
-      assert.equal('<fb:foo-bar></fb:foo-bar>', pug.render('fb:foo-bar'), 'Test hyphens');
-      assert.equal('<div class="something"></div>', pug.render('div.something'), 'Test classes');
-      assert.equal('<div id="something"></div>', pug.render('div#something'), 'Test ids');
-      assert.equal('<div class="something"></div>', pug.render('.something'), 'Test stand-alone classes');
-      assert.equal('<div id="something"></div>', pug.render('#something'), 'Test stand-alone ids');
+      assert.equal(
+        '<fb:foo-bar></fb:foo-bar>',
+        pug.render('fb:foo-bar'),
+        'Test hyphens'
+      );
+      assert.equal(
+        '<div class="something"></div>',
+        pug.render('div.something'),
+        'Test classes'
+      );
+      assert.equal(
+        '<div id="something"></div>',
+        pug.render('div#something'),
+        'Test ids'
+      );
+      assert.equal(
+        '<div class="something"></div>',
+        pug.render('.something'),
+        'Test stand-alone classes'
+      );
+      assert.equal(
+        '<div id="something"></div>',
+        pug.render('#something'),
+        'Test stand-alone ids'
+      );
       assert.equal('<div class="bar" id="foo"></div>', pug.render('#foo.bar'));
       assert.equal('<div class="bar" id="foo"></div>', pug.render('.bar#foo'));
-      assert.equal('<div class="bar" id="foo"></div>', pug.render('div#foo(class="bar")'));
-      assert.equal('<div class="bar" id="foo"></div>', pug.render('div(class="bar")#foo'));
-      assert.equal('<div class="foo" id="bar"></div>', pug.render('div(id="bar").foo'));
-      assert.equal('<div class="foo bar baz"></div>', pug.render('div.foo.bar.baz'));
-      assert.equal('<div class="foo bar baz"></div>', pug.render('div(class="foo").bar.baz'));
-      assert.equal('<div class="foo bar baz"></div>', pug.render('div.foo(class="bar").baz'));
-      assert.equal('<div class="foo bar baz"></div>', pug.render('div.foo.bar(class="baz")'));
+      assert.equal(
+        '<div class="bar" id="foo"></div>',
+        pug.render('div#foo(class="bar")')
+      );
+      assert.equal(
+        '<div class="bar" id="foo"></div>',
+        pug.render('div(class="bar")#foo')
+      );
+      assert.equal(
+        '<div class="foo" id="bar"></div>',
+        pug.render('div(id="bar").foo')
+      );
+      assert.equal(
+        '<div class="foo bar baz"></div>',
+        pug.render('div.foo.bar.baz')
+      );
+      assert.equal(
+        '<div class="foo bar baz"></div>',
+        pug.render('div(class="foo").bar.baz')
+      );
+      assert.equal(
+        '<div class="foo bar baz"></div>',
+        pug.render('div.foo(class="bar").baz')
+      );
+      assert.equal(
+        '<div class="foo bar baz"></div>',
+        pug.render('div.foo.bar(class="baz")')
+      );
       assert.equal('<div class="a-b2"></div>', pug.render('div.a-b2'));
       assert.equal('<div class="a_b2"></div>', pug.render('div.a_b2'));
       assert.equal('<fb:user></fb:user>', pug.render('fb:user'));
       assert.equal('<fb:user:role></fb:user:role>', pug.render('fb:user:role'));
-      assert.equal('<colgroup><col class="test"/></colgroup>', pug.render('colgroup\n  col.test'));
+      assert.equal(
+        '<colgroup><col class="test"/></colgroup>',
+        pug.render('colgroup\n  col.test')
+      );
     });
 
-    it('should support nested tags', function(){
+    it('should support nested tags', function() {
       var str = [
-          'ul',
-          '  li a',
-          '  li b',
-          '  li',
-          '    ul',
-          '      li c',
-          '      li d',
-          '  li e',
+        'ul',
+        '  li a',
+        '  li b',
+        '  li',
+        '    ul',
+        '      li c',
+        '      li d',
+        '  li e',
       ].join('\n');
 
       var html = [
-          '<ul>',
-          '<li>a</li>',
-          '<li>b</li>',
-          '<li><ul><li>c</li><li>d</li></ul></li>',
-          '<li>e</li>',
-          '</ul>'
+        '<ul>',
+        '<li>a</li>',
+        '<li>b</li>',
+        '<li><ul><li>c</li><li>d</li></ul></li>',
+        '<li>e</li>',
+        '</ul>',
       ].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          'a(href="#")',
-          '  | foo ',
-          '  | bar ',
-          '  | baz'
-      ].join('\n');
+      var str = ['a(href="#")', '  | foo ', '  | bar ', '  | baz'].join('\n');
 
       assert.equal('<a href="#">foo \nbar \nbaz</a>', pug.render(str));
 
-      var str = [
-          'ul',
-          '  li one',
-          '  ul',
-          '    | two',
-          '    li three'
-      ].join('\n');
+      var str = ['ul', '  li one', '  ul', '    | two', '    li three'].join(
+        '\n'
+      );
 
       var html = [
-          '<ul>',
-          '<li>one</li>',
-          '<ul>two',
-          '<li>three</li>',
-          '</ul>',
-          '</ul>'
+        '<ul>',
+        '<li>one</li>',
+        '<ul>two',
+        '<li>three</li>',
+        '</ul>',
+        '</ul>',
       ].join('');
 
       assert.equal(html, pug.render(str));
     });
 
-    it('should support variable length newlines', function(){
+    it('should support variable length newlines', function() {
       var str = [
-          'ul',
-          '  li a',
-          '  ',
-          '  li b',
-          ' ',
-          '         ',
-          '  li',
-          '    ul',
-          '      li c',
-          '',
-          '      li d',
-          '  li e',
+        'ul',
+        '  li a',
+        '  ',
+        '  li b',
+        ' ',
+        '         ',
+        '  li',
+        '    ul',
+        '      li c',
+        '',
+        '      li d',
+        '  li e',
       ].join('\n');
 
       var html = [
-          '<ul>',
-          '<li>a</li>',
-          '<li>b</li>',
-          '<li><ul><li>c</li><li>d</li></ul></li>',
-          '<li>e</li>',
-          '</ul>'
+        '<ul>',
+        '<li>a</li>',
+        '<li>b</li>',
+        '<li><ul><li>c</li><li>d</li></ul></li>',
+        '<li>e</li>',
+        '</ul>',
       ].join('');
 
       assert.equal(html, pug.render(str));
     });
 
-    it('should support tab conversion', function(){
+    it('should support tab conversion', function() {
       var str = [
-          'ul',
-          '\tli a',
-          '\t',
-          '\tli b',
-          '\t\t',
-          '\t\t\t\t\t\t',
-          '\tli',
-          '\t\tul',
-          '\t\t\tli c',
-          '',
-          '\t\t\tli d',
-          '\tli e',
+        'ul',
+        '\tli a',
+        '\t',
+        '\tli b',
+        '\t\t',
+        '\t\t\t\t\t\t',
+        '\tli',
+        '\t\tul',
+        '\t\t\tli c',
+        '',
+        '\t\t\tli d',
+        '\tli e',
       ].join('\n');
 
       var html = [
-          '<ul>',
-          '<li>a</li>',
-          '<li>b</li>',
-          '<li><ul><li>c</li><li>d</li></ul></li>',
-          '<li>e</li>',
-          '</ul>'
+        '<ul>',
+        '<li>a</li>',
+        '<li>b</li>',
+        '<li><ul><li>c</li><li>d</li></ul></li>',
+        '<li>e</li>',
+        '</ul>',
       ].join('');
 
       assert.equal(html, pug.render(str));
     });
 
-    it('should support newlines', function(){
+    it('should support newlines', function() {
       var str = [
-          'ul',
-          '  li a',
-          '  ',
-          '    ',
-          '',
-          ' ',
-          '  li b',
-          '  li',
-          '    ',
-          '        ',
-          ' ',
-          '    ul',
-          '      ',
-          '      li c',
-          '      li d',
-          '  li e',
+        'ul',
+        '  li a',
+        '  ',
+        '    ',
+        '',
+        ' ',
+        '  li b',
+        '  li',
+        '    ',
+        '        ',
+        ' ',
+        '    ul',
+        '      ',
+        '      li c',
+        '      li d',
+        '  li e',
       ].join('\n');
 
       var html = [
-          '<ul>',
-          '<li>a</li>',
-          '<li>b</li>',
-          '<li><ul><li>c</li><li>d</li></ul></li>',
-          '<li>e</li>',
-          '</ul>'
+        '<ul>',
+        '<li>a</li>',
+        '<li>b</li>',
+        '<li><ul><li>c</li><li>d</li></ul></li>',
+        '<li>e</li>',
+        '</ul>',
       ].join('');
 
       assert.equal(html, pug.render(str));
 
       var str = [
-          'html',
-          ' ',
-          '  head',
-          '    != "test"',
-          '  ',
-          '  ',
-          '  ',
-          '  body'
+        'html',
+        ' ',
+        '  head',
+        '    != "test"',
+        '  ',
+        '  ',
+        '  ',
+        '  body',
       ].join('\n');
 
       var html = [
-          '<html>',
-          '<head>',
-          'test',
-          '</head>',
-          '<body></body>',
-          '</html>'
+        '<html>',
+        '<head>',
+        'test',
+        '</head>',
+        '<body></body>',
+        '</html>',
       ].join('');
 
       assert.equal(html, pug.render(str));
-      assert.equal('<foo></foo>something<bar></bar>', pug.render('foo\n= "something"\nbar'));
-      assert.equal('<foo></foo>something<bar></bar>else', pug.render('foo\n= "something"\nbar\n= "else"'));
+      assert.equal(
+        '<foo></foo>something<bar></bar>',
+        pug.render('foo\n= "something"\nbar')
+      );
+      assert.equal(
+        '<foo></foo>something<bar></bar>else',
+        pug.render('foo\n= "something"\nbar\n= "else"')
+      );
     });
 
-    it('should support text', function(){
+    it('should support text', function() {
       assert.equal('foo\nbar\nbaz', pug.render('| foo\n| bar\n| baz'));
       assert.equal('foo \nbar \nbaz', pug.render('| foo \n| bar \n| baz'));
       assert.equal('(hey)', pug.render('| (hey)'));
@@ -285,167 +327,435 @@ describe('pug', function(){
       assert.equal('  foo  \n bar    ', pug.render('|   foo  \n|  bar    '));
     });
 
-    it('should support pipe-less text', function(){
-      assert.equal('<pre><code><foo></foo><bar></bar></code></pre>', pug.render('pre\n  code\n    foo\n\n    bar'));
+    it('should support pipe-less text', function() {
+      assert.equal(
+        '<pre><code><foo></foo><bar></bar></code></pre>',
+        pug.render('pre\n  code\n    foo\n\n    bar')
+      );
       assert.equal('<p>foo\n\nbar</p>', pug.render('p.\n  foo\n\n  bar'));
-      assert.equal('<p>foo\n\n\n\nbar</p>', pug.render('p.\n  foo\n\n\n\n  bar'));
-      assert.equal('<p>foo\n  bar\nfoo</p>', pug.render('p.\n  foo\n    bar\n  foo'));
-      assert.equal('<script>s.parentNode.insertBefore(g,s)</script>', pug.render('script.\n  s.parentNode.insertBefore(g,s)\n'));
-      assert.equal('<script>s.parentNode.insertBefore(g,s)</script>', pug.render('script.\n  s.parentNode.insertBefore(g,s)'));
-    });
-
-    it('should support tag text', function(){
+      assert.equal(
+        '<p>foo\n\n\n\nbar</p>',
+        pug.render('p.\n  foo\n\n\n\n  bar')
+      );
+      assert.equal(
+        '<p>foo\n  bar\nfoo</p>',
+        pug.render('p.\n  foo\n    bar\n  foo')
+      );
+      assert.equal(
+        '<script>s.parentNode.insertBefore(g,s)</script>',
+        pug.render('script.\n  s.parentNode.insertBefore(g,s)\n')
+      );
+      assert.equal(
+        '<script>s.parentNode.insertBefore(g,s)</script>',
+        pug.render('script.\n  s.parentNode.insertBefore(g,s)')
+      );
+    });
+
+    it('should support tag text', function() {
       assert.equal('<p>some random text</p>', pug.render('p some random text'));
-      assert.equal('<p>click<a>Google</a>.</p>', pug.render('p\n  | click\n  a Google\n  | .'));
+      assert.equal(
+        '<p>click<a>Google</a>.</p>',
+        pug.render('p\n  | click\n  a Google\n  | .')
+      );
       assert.equal('<p>(parens)</p>', pug.render('p (parens)'));
-      assert.equal('<p foo="bar">(parens)</p>', pug.render('p(foo="bar") (parens)'));
-      assert.equal('<option value="">-- (optional) foo --</option>', pug.render('option(value="") -- (optional) foo --'));
-    });
-
-    it('should support tag text block', function(){
-      assert.equal('<p>foo \nbar \nbaz</p>', pug.render('p\n  | foo \n  | bar \n  | baz'));
-      assert.equal('<label>Password:<input/></label>', pug.render('label\n  | Password:\n  input'));
-      assert.equal('<label>Password:<input/></label>', pug.render('label Password:\n  input'));
-    });
-
-    it('should support tag text interpolation', function(){
-      assert.equal('yo, pug is cool', pug.render('| yo, #{name} is cool\n', { name: 'pug' }));
-      assert.equal('<p>yo, pug is cool</p>', pug.render('p yo, #{name} is cool', { name: 'pug' }));
-      assert.equal('yo, pug is cool', pug.render('| yo, #{name || "pug"} is cool', { name: null }));
-      assert.equal('yo, \'pug\' is cool', pug.render('| yo, #{name || "\'pug\'"} is cool', { name: null }));
-      assert.equal('foo &lt;script&gt; bar', pug.render('| foo #{code} bar', { code: '<script>' }));
-      assert.equal('foo <script> bar', pug.render('| foo !{code} bar', { code: '<script>' }));
-    });
-
-    it('should support flexible indentation', function(){
-      assert.equal('<html><body><h1>Wahoo</h1><p>test</p></body></html>', pug.render('html\n  body\n   h1 Wahoo\n   p test'));
-    });
-
-    it('should support interpolation values', function(){
+      assert.equal(
+        '<p foo="bar">(parens)</p>',
+        pug.render('p(foo="bar") (parens)')
+      );
+      assert.equal(
+        '<option value="">-- (optional) foo --</option>',
+        pug.render('option(value="") -- (optional) foo --')
+      );
+    });
+
+    it('should support tag text block', function() {
+      assert.equal(
+        '<p>foo \nbar \nbaz</p>',
+        pug.render('p\n  | foo \n  | bar \n  | baz')
+      );
+      assert.equal(
+        '<label>Password:<input/></label>',
+        pug.render('label\n  | Password:\n  input')
+      );
+      assert.equal(
+        '<label>Password:<input/></label>',
+        pug.render('label Password:\n  input')
+      );
+    });
+
+    it('should support tag text interpolation', function() {
+      assert.equal(
+        'yo, pug is cool',
+        pug.render('| yo, #{name} is cool\n', {name: 'pug'})
+      );
+      assert.equal(
+        '<p>yo, pug is cool</p>',
+        pug.render('p yo, #{name} is cool', {name: 'pug'})
+      );
+      assert.equal(
+        'yo, pug is cool',
+        pug.render('| yo, #{name || "pug"} is cool', {name: null})
+      );
+      assert.equal(
+        "yo, 'pug' is cool",
+        pug.render('| yo, #{name || "\'pug\'"} is cool', {name: null})
+      );
+      assert.equal(
+        'foo &lt;script&gt; bar',
+        pug.render('| foo #{code} bar', {code: '<script>'})
+      );
+      assert.equal(
+        'foo <script> bar',
+        pug.render('| foo !{code} bar', {code: '<script>'})
+      );
+    });
+
+    it('should support flexible indentation', function() {
+      assert.equal(
+        '<html><body><h1>Wahoo</h1><p>test</p></body></html>',
+        pug.render('html\n  body\n   h1 Wahoo\n   p test')
+      );
+    });
+
+    it('should support interpolation values', function() {
       assert.equal('<p>Users: 15</p>', pug.render('p Users: #{15}'));
       assert.equal('<p>Users: </p>', pug.render('p Users: #{null}'));
       assert.equal('<p>Users: </p>', pug.render('p Users: #{undefined}'));
-      assert.equal('<p>Users: none</p>', pug.render('p Users: #{undefined || "none"}'));
+      assert.equal(
+        '<p>Users: none</p>',
+        pug.render('p Users: #{undefined || "none"}')
+      );
       assert.equal('<p>Users: 0</p>', pug.render('p Users: #{0}'));
       assert.equal('<p>Users: false</p>', pug.render('p Users: #{false}'));
     });
 
-    it('should support test html 5 mode', function(){
-      assert.equal('<!DOCTYPE html><input type="checkbox" checked>', pug.render('doctype html\ninput(type="checkbox", checked)'));
-      assert.equal('<!DOCTYPE html><input type="checkbox" checked>', pug.render('doctype html\ninput(type="checkbox", checked=true)'));
-      assert.equal('<!DOCTYPE html><input type="checkbox">', pug.render('doctype html\ninput(type="checkbox", checked= false)'));
-    });
-
-    it('should support multi-line attrs', function(){
-      assert.equal('<a foo="bar" bar="baz" checked="checked">foo</a>', pug.render('a(foo="bar"\n  bar="baz"\n  checked) foo'));
-      assert.equal('<a foo="bar" bar="baz" checked="checked">foo</a>', pug.render('a(foo="bar"\nbar="baz"\nchecked) foo'));
-      assert.equal('<a foo="bar" bar="baz" checked="checked">foo</a>', pug.render('a(foo="bar"\n,bar="baz"\n,checked) foo'));
-      assert.equal('<a foo="bar" bar="baz" checked="checked">foo</a>', pug.render('a(foo="bar",\nbar="baz",\nchecked) foo'));
-    });
-
-    it('should support attrs', function(){
-      assert.equal('<img src="&lt;script&gt;"/>', pug.render('img(src="<script>")'), 'Test attr escaping');
+    it('should support test html 5 mode', function() {
+      assert.equal(
+        '<!DOCTYPE html><input type="checkbox" checked>',
+        pug.render('doctype html\ninput(type="checkbox", checked)')
+      );
+      assert.equal(
+        '<!DOCTYPE html><input type="checkbox" checked>',
+        pug.render('doctype html\ninput(type="checkbox", checked=true)')
+      );
+      assert.equal(
+        '<!DOCTYPE html><input type="checkbox">',
+        pug.render('doctype html\ninput(type="checkbox", checked= false)')
+      );
+    });
+
+    it('should support multi-line attrs', function() {
+      assert.equal(
+        '<a foo="bar" bar="baz" checked="checked">foo</a>',
+        pug.render('a(foo="bar"\n  bar="baz"\n  checked) foo')
+      );
+      assert.equal(
+        '<a foo="bar" bar="baz" checked="checked">foo</a>',
+        pug.render('a(foo="bar"\nbar="baz"\nchecked) foo')
+      );
+      assert.equal(
+        '<a foo="bar" bar="baz" checked="checked">foo</a>',
+        pug.render('a(foo="bar"\n,bar="baz"\n,checked) foo')
+      );
+      assert.equal(
+        '<a foo="bar" bar="baz" checked="checked">foo</a>',
+        pug.render('a(foo="bar",\nbar="baz",\nchecked) foo')
+      );
+    });
+
+    it('should support attrs', function() {
+      assert.equal(
+        '<img src="&lt;script&gt;"/>',
+        pug.render('img(src="<script>")'),
+        'Test attr escaping'
+      );
 
       assert.equal('<a data-attr="bar"></a>', pug.render('a(data-attr="bar")'));
-      assert.equal('<a data-attr="bar" data-attr-2="baz"></a>', pug.render('a(data-attr="bar", data-attr-2="baz")'));
-
-      assert.equal('<a title="foo,bar"></a>', pug.render('a(title= "foo,bar")'));
-      assert.equal('<a title="foo,bar" href="#"></a>', pug.render('a(title= "foo,bar", href="#")'));
-
-      assert.equal('<p class="foo"></p>', pug.render("p(class='foo')"), 'Test single quoted attrs');
-      assert.equal('<input type="checkbox" checked="checked"/>', pug.render('input( type="checkbox", checked )'));
-      assert.equal('<input type="checkbox" checked="checked"/>', pug.render('input( type="checkbox", checked = true )'));
-      assert.equal('<input type="checkbox"/>', pug.render('input(type="checkbox", checked= false)'));
-      assert.equal('<input type="checkbox"/>', pug.render('input(type="checkbox", checked= null)'));
-      assert.equal('<input type="checkbox"/>', pug.render('input(type="checkbox", checked= undefined)'));
-
-      assert.equal('<img src="/foo.png"/>', pug.render('img(src="/foo.png")'), 'Test attr =');
-      assert.equal('<img src="/foo.png"/>', pug.render('img(src  =  "/foo.png")'), 'Test attr = whitespace');
-      assert.equal('<img src="/foo.png"/>', pug.render('img(src="/foo.png")'), 'Test attr :');
-      assert.equal('<img src="/foo.png"/>', pug.render('img(src  =  "/foo.png")'), 'Test attr : whitespace');
-
-      assert.equal('<img src="/foo.png" alt="just some foo"/>', pug.render('img(src="/foo.png", alt="just some foo")'));
-      assert.equal('<img src="/foo.png" alt="just some foo"/>', pug.render('img(src = "/foo.png", alt = "just some foo")'));
-
-      assert.equal('<p class="foo,bar,baz"></p>', pug.render('p(class="foo,bar,baz")'));
-      assert.equal('<a href="http://google.com" title="Some : weird = title"></a>', pug.render('a(href= "http://google.com", title= "Some : weird = title")'));
-      assert.equal('<label for="name"></label>', pug.render('label(for="name")'));
-      assert.equal('<meta name="viewport" content="width=device-width"/>', pug.render("meta(name= 'viewport', content='width=device-width')"), 'Test attrs that contain attr separators');
-      assert.equal('<div style="color= white"></div>', pug.render("div(style='color= white')"));
-      assert.equal('<div style="color: white"></div>', pug.render("div(style='color: white')"));
-      assert.equal('<p class="foo"></p>', pug.render("p('class'='foo')"), 'Test keys with single quotes');
-      assert.equal('<p class="foo"></p>', pug.render("p(\"class\"= 'foo')"), 'Test keys with double quotes');
+      assert.equal(
+        '<a data-attr="bar" data-attr-2="baz"></a>',
+        pug.render('a(data-attr="bar", data-attr-2="baz")')
+      );
+
+      assert.equal(
+        '<a title="foo,bar"></a>',
+        pug.render('a(title= "foo,bar")')
+      );
+      assert.equal(
+        '<a title="foo,bar" href="#"></a>',
+        pug.render('a(title= "foo,bar", href="#")')
+      );
+
+      assert.equal(
+        '<p class="foo"></p>',
+        pug.render("p(class='foo')"),
+        'Test single quoted attrs'
+      );
+      assert.equal(
+        '<input type="checkbox" checked="checked"/>',
+        pug.render('input( type="checkbox", checked )')
+      );
+      assert.equal(
+        '<input type="checkbox" checked="checked"/>',
+        pug.render('input( type="checkbox", checked = true )')
+      );
+      assert.equal(
+        '<input type="checkbox"/>',
+        pug.render('input(type="checkbox", checked= false)')
+      );
+      assert.equal(
+        '<input type="checkbox"/>',
+        pug.render('input(type="checkbox", checked= null)')
+      );
+      assert.equal(
+        '<input type="checkbox"/>',
+        pug.render('input(type="checkbox", checked= undefined)')
+      );
+
+      assert.equal(
+        '<img src="/foo.png"/>',
+        pug.render('img(src="/foo.png")'),
+        'Test attr ='
+      );
+      assert.equal(
+        '<img src="/foo.png"/>',
+        pug.render('img(src  =  "/foo.png")'),
+        'Test attr = whitespace'
+      );
+      assert.equal(
+        '<img src="/foo.png"/>',
+        pug.render('img(src="/foo.png")'),
+        'Test attr :'
+      );
+      assert.equal(
+        '<img src="/foo.png"/>',
+        pug.render('img(src  =  "/foo.png")'),
+        'Test attr : whitespace'
+      );
+
+      assert.equal(
+        '<img src="/foo.png" alt="just some foo"/>',
+        pug.render('img(src="/foo.png", alt="just some foo")')
+      );
+      assert.equal(
+        '<img src="/foo.png" alt="just some foo"/>',
+        pug.render('img(src = "/foo.png", alt = "just some foo")')
+      );
+
+      assert.equal(
+        '<p class="foo,bar,baz"></p>',
+        pug.render('p(class="foo,bar,baz")')
+      );
+      assert.equal(
+        '<a href="http://google.com" title="Some : weird = title"></a>',
+        pug.render(
+          'a(href= "http://google.com", title= "Some : weird = title")'
+        )
+      );
+      assert.equal(
+        '<label for="name"></label>',
+        pug.render('label(for="name")')
+      );
+      assert.equal(
+        '<meta name="viewport" content="width=device-width"/>',
+        pug.render("meta(name= 'viewport', content='width=device-width')"),
+        'Test attrs that contain attr separators'
+      );
+      assert.equal(
+        '<div style="color= white"></div>',
+        pug.render("div(style='color= white')")
+      );
+      assert.equal(
+        '<div style="color: white"></div>',
+        pug.render("div(style='color: white')")
+      );
+      assert.equal(
+        '<p class="foo"></p>',
+        pug.render("p('class'='foo')"),
+        'Test keys with single quotes'
+      );
+      assert.equal(
+        '<p class="foo"></p>',
+        pug.render('p("class"= \'foo\')'),
+        'Test keys with double quotes'
+      );
 
       assert.equal('<p data-lang="en"></p>', pug.render('p(data-lang = "en")'));
-      assert.equal('<p data-dynamic="true"></p>', pug.render('p("data-dynamic"= "true")'));
-      assert.equal('<p class="name" data-dynamic="true"></p>', pug.render('p("class"= "name", "data-dynamic"= "true")'));
-      assert.equal('<p data-dynamic="true"></p>', pug.render('p(\'data-dynamic\'= "true")'));
-      assert.equal('<p class="name" data-dynamic="true"></p>', pug.render('p(\'class\'= "name", \'data-dynamic\'= "true")'));
-      assert.equal('<p class="name" data-dynamic="true" yay="yay"></p>', pug.render('p(\'class\'= "name", \'data-dynamic\'= "true", yay)'));
-
-      assert.equal('<input checked="checked" type="checkbox"/>', pug.render('input(checked, type="checkbox")'));
-
-      assert.equal('<a data-foo="{ foo: \'bar\', bar= \'baz\' }"></a>', pug.render('a(data-foo  = "{ foo: \'bar\', bar= \'baz\' }")'));
-
-      assert.equal('<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>', pug.render('meta(http-equiv="X-UA-Compatible", content="IE=edge,chrome=1")'));
-
-      assert.equal('<div style="background: url(/images/test.png)">Foo</div>', pug.render("div(style= 'background: url(/images/test.png)') Foo"));
-      assert.equal('<div style="background = url(/images/test.png)">Foo</div>', pug.render("div(style= 'background = url(/images/test.png)') Foo"));
-      assert.equal('<div style="foo">Foo</div>', pug.render("div(style= ['foo', 'bar'][0]) Foo"));
-      assert.equal('<div style="bar">Foo</div>', pug.render("div(style= { foo: 'bar', baz: 'raz' }['foo']) Foo"));
-      assert.equal('<a href="def">Foo</a>', pug.render("a(href='abcdefg'.substr(3,3)) Foo"));
-      assert.equal('<a href="def">Foo</a>', pug.render("a(href={test: 'abcdefg'}.test.substr(3,3)) Foo"));
-      assert.equal('<a href="def">Foo</a>', pug.render("a(href={test: 'abcdefg'}.test.substr(3,[0,3][1])) Foo"));
-
-      assert.equal('<rss xmlns:atom="atom"></rss>', pug.render("rss(xmlns:atom=\"atom\")"));
-      assert.equal('<rss xmlns:atom="atom"></rss>', pug.render("rss('xmlns:atom'=\"atom\")"));
-      assert.equal('<rss xmlns:atom="atom"></rss>', pug.render("rss(\"xmlns:atom\"='atom')"));
-      assert.equal('<rss xmlns:atom="atom" foo="bar"></rss>', pug.render("rss('xmlns:atom'=\"atom\", 'foo'= 'bar')"));
-      assert.equal('<a data-obj="{ foo: \'bar\' }"></a>', pug.render("a(data-obj= \"{ foo: 'bar' }\")"));
-
-      assert.equal('<meta content="what\'s up? \'weee\'"/>', pug.render('meta(content="what\'s up? \'weee\'")'));
-    });
-
-    it('should support class attr array', function(){
-      assert.equal('<body class="foo bar baz"></body>', pug.render('body(class=["foo", "bar", "baz"])'));
-    });
-
-    it('should support attr parens', function(){
-      assert.equal('<p foo="bar">baz</p>', pug.render('p(foo=((("bar"))))= ((("baz")))'));
-    });
-
-    it('should support code attrs', function(){
-      assert.equal('<p></p>', pug.render('p(id= name)', { name: undefined }));
-      assert.equal('<p></p>', pug.render('p(id= name)', { name: null }));
-      assert.equal('<p></p>', pug.render('p(id= name)', { name: false }));
-      assert.equal('<p id=""></p>', pug.render('p(id= name)', { name: '' }));
-      assert.equal('<p id="tj"></p>', pug.render('p(id= name)', { name: 'tj' }));
-      assert.equal('<p id="default"></p>', pug.render('p(id= name || "default")', { name: null }));
-      assert.equal('<p id="something"></p>', pug.render("p(id= 'something')", { name: null }));
-      assert.equal('<p id="something"></p>', pug.render("p(id = 'something')", { name: null }));
-      assert.equal('<p id="foo"></p>', pug.render("p(id= (true ? 'foo' : 'bar'))"));
-      assert.equal('<option value="">Foo</option>', pug.render("option(value='') Foo"));
-    });
-
-    it('should support code attrs class', function(){
-      assert.equal('<p class="tj"></p>', pug.render('p(class= name)', { name: 'tj' }));
-      assert.equal('<p class="tj"></p>', pug.render('p( class= name )', { name: 'tj' }));
-      assert.equal('<p class="default"></p>', pug.render('p(class= name || "default")', { name: null }));
-      assert.equal('<p class="foo default"></p>', pug.render('p.foo(class= name || "default")', { name: null }));
-      assert.equal('<p class="default foo"></p>', pug.render('p(class= name || "default").foo', { name: null }));
-      assert.equal('<p id="default"></p>', pug.render('p(id = name || "default")', { name: null }));
+      assert.equal(
+        '<p data-dynamic="true"></p>',
+        pug.render('p("data-dynamic"= "true")')
+      );
+      assert.equal(
+        '<p class="name" data-dynamic="true"></p>',
+        pug.render('p("class"= "name", "data-dynamic"= "true")')
+      );
+      assert.equal(
+        '<p data-dynamic="true"></p>',
+        pug.render('p(\'data-dynamic\'= "true")')
+      );
+      assert.equal(
+        '<p class="name" data-dynamic="true"></p>',
+        pug.render('p(\'class\'= "name", \'data-dynamic\'= "true")')
+      );
+      assert.equal(
+        '<p class="name" data-dynamic="true" yay="yay"></p>',
+        pug.render('p(\'class\'= "name", \'data-dynamic\'= "true", yay)')
+      );
+
+      assert.equal(
+        '<input checked="checked" type="checkbox"/>',
+        pug.render('input(checked, type="checkbox")')
+      );
+
+      assert.equal(
+        "<a data-foo=\"{ foo: 'bar', bar= 'baz' }\"></a>",
+        pug.render("a(data-foo  = \"{ foo: 'bar', bar= 'baz' }\")")
+      );
+
+      assert.equal(
+        '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>',
+        pug.render(
+          'meta(http-equiv="X-UA-Compatible", content="IE=edge,chrome=1")'
+        )
+      );
+
+      assert.equal(
+        '<div style="background: url(/images/test.png)">Foo</div>',
+        pug.render("div(style= 'background: url(/images/test.png)') Foo")
+      );
+      assert.equal(
+        '<div style="background = url(/images/test.png)">Foo</div>',
+        pug.render("div(style= 'background = url(/images/test.png)') Foo")
+      );
+      assert.equal(
+        '<div style="foo">Foo</div>',
+        pug.render("div(style= ['foo', 'bar'][0]) Foo")
+      );
+      assert.equal(
+        '<div style="bar">Foo</div>',
+        pug.render("div(style= { foo: 'bar', baz: 'raz' }['foo']) Foo")
+      );
+      assert.equal(
+        '<a href="def">Foo</a>',
+        pug.render("a(href='abcdefg'.substr(3,3)) Foo")
+      );
+      assert.equal(
+        '<a href="def">Foo</a>',
+        pug.render("a(href={test: 'abcdefg'}.test.substr(3,3)) Foo")
+      );
+      assert.equal(
+        '<a href="def">Foo</a>',
+        pug.render("a(href={test: 'abcdefg'}.test.substr(3,[0,3][1])) Foo")
+      );
+
+      assert.equal(
+        '<rss xmlns:atom="atom"></rss>',
+        pug.render('rss(xmlns:atom="atom")')
+      );
+      assert.equal(
+        '<rss xmlns:atom="atom"></rss>',
+        pug.render('rss(\'xmlns:atom\'="atom")')
+      );
+      assert.equal(
+        '<rss xmlns:atom="atom"></rss>',
+        pug.render('rss("xmlns:atom"=\'atom\')')
+      );
+      assert.equal(
+        '<rss xmlns:atom="atom" foo="bar"></rss>',
+        pug.render("rss('xmlns:atom'=\"atom\", 'foo'= 'bar')")
+      );
+      assert.equal(
+        '<a data-obj="{ foo: \'bar\' }"></a>',
+        pug.render('a(data-obj= "{ foo: \'bar\' }")')
+      );
+
+      assert.equal(
+        "<meta content=\"what's up? 'weee'\"/>",
+        pug.render("meta(content=\"what's up? 'weee'\")")
+      );
+    });
+
+    it('should support class attr array', function() {
+      assert.equal(
+        '<body class="foo bar baz"></body>',
+        pug.render('body(class=["foo", "bar", "baz"])')
+      );
+    });
+
+    it('should support attr parens', function() {
+      assert.equal(
+        '<p foo="bar">baz</p>',
+        pug.render('p(foo=((("bar"))))= ((("baz")))')
+      );
+    });
+
+    it('should support code attrs', function() {
+      assert.equal('<p></p>', pug.render('p(id= name)', {name: undefined}));
+      assert.equal('<p></p>', pug.render('p(id= name)', {name: null}));
+      assert.equal('<p></p>', pug.render('p(id= name)', {name: false}));
+      assert.equal('<p id=""></p>', pug.render('p(id= name)', {name: ''}));
+      assert.equal('<p id="tj"></p>', pug.render('p(id= name)', {name: 'tj'}));
+      assert.equal(
+        '<p id="default"></p>',
+        pug.render('p(id= name || "default")', {name: null})
+      );
+      assert.equal(
+        '<p id="something"></p>',
+        pug.render("p(id= 'something')", {name: null})
+      );
+      assert.equal(
+        '<p id="something"></p>',
+        pug.render("p(id = 'something')", {name: null})
+      );
+      assert.equal(
+        '<p id="foo"></p>',
+        pug.render("p(id= (true ? 'foo' : 'bar'))")
+      );
+      assert.equal(
+        '<option value="">Foo</option>',
+        pug.render("option(value='') Foo")
+      );
+    });
+
+    it('should support code attrs class', function() {
+      assert.equal(
+        '<p class="tj"></p>',
+        pug.render('p(class= name)', {name: 'tj'})
+      );
+      assert.equal(
+        '<p class="tj"></p>',
+        pug.render('p( class= name )', {name: 'tj'})
+      );
+      assert.equal(
+        '<p class="default"></p>',
+        pug.render('p(class= name || "default")', {name: null})
+      );
+      assert.equal(
+        '<p class="foo default"></p>',
+        pug.render('p.foo(class= name || "default")', {name: null})
+      );
+      assert.equal(
+        '<p class="default foo"></p>',
+        pug.render('p(class= name || "default").foo', {name: null})
+      );
+      assert.equal(
+        '<p id="default"></p>',
+        pug.render('p(id = name || "default")', {name: null})
+      );
       assert.equal('<p id="user-1"></p>', pug.render('p(id = "user-" + 1)'));
-      assert.equal('<p class="user-1"></p>', pug.render('p(class = "user-" + 1)'));
+      assert.equal(
+        '<p class="user-1"></p>',
+        pug.render('p(class = "user-" + 1)')
+      );
     });
 
-    it('should support code buffering', function(){
+    it('should support code buffering', function() {
       assert.equal('<p></p>', pug.render('p= null'));
       assert.equal('<p></p>', pug.render('p= undefined'));
       assert.equal('<p>0</p>', pug.render('p= 0'));
       assert.equal('<p>false</p>', pug.render('p= false'));
     });
 
-    it('should support script text', function(){
+    it('should support script text', function() {
       var str = [
         'script.',
         '  p foo',
@@ -454,409 +764,330 @@ describe('pug', function(){
         '  p foo',
         '',
         'script(type="text/template").',
-        '  p foo'
+        '  p foo',
       ].join('\n');
 
       var html = [
         '<script>p foo\n</script>',
         '<script type="text/template"><p>foo</p></script>',
-        '<script type="text/template">p foo</script>'
+        '<script type="text/template">p foo</script>',
       ].join('');
 
       assert.equal(html, pug.render(str));
     });
 
-    it('should support comments', function(){
+    it('should support comments', function() {
       // Regular
-      var str = [
-          '//foo',
-          'p bar'
-      ].join('\n');
+      var str = ['//foo', 'p bar'].join('\n');
 
-      var html = [
-          '<!--foo-->',
-          '<p>bar</p>'
-      ].join('');
+      var html = ['<!--foo-->', '<p>bar</p>'].join('');
 
       assert.equal(html, pug.render(str));
 
       // Between tags
 
-      var str = [
-          'p foo',
-          '// bar ',
-          'p baz'
-      ].join('\n');
+      var str = ['p foo', '// bar ', 'p baz'].join('\n');
 
-      var html = [
-          '<p>foo</p>',
-          '<!-- bar -->',
-          '<p>baz</p>'
-      ].join('');
+      var html = ['<p>foo</p>', '<!-- bar -->', '<p>baz</p>'].join('');
 
       assert.equal(html, pug.render(str));
 
       // Quotes
 
       var str = "<!-- script(src: '/js/validate.js') -->",
-          js = "// script(src: '/js/validate.js') ";
+        js = "// script(src: '/js/validate.js') ";
       assert.equal(str, pug.render(js));
     });
 
-    it('should support unbuffered comments', function(){
-      var str = [
-          '//- foo',
-          'p bar'
-      ].join('\n');
+    it('should support unbuffered comments', function() {
+      var str = ['//- foo', 'p bar'].join('\n');
 
-      var html = [
-          '<p>bar</p>'
-      ].join('');
+      var html = ['<p>bar</p>'].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          'p foo',
-          '//- bar ',
-          'p baz'
-      ].join('\n');
+      var str = ['p foo', '//- bar ', 'p baz'].join('\n');
 
-      var html = [
-          '<p>foo</p>',
-          '<p>baz</p>'
-      ].join('');
+      var html = ['<p>foo</p>', '<p>baz</p>'].join('');
 
       assert.equal(html, pug.render(str));
     });
 
-    it('should support literal html', function(){
-      assert.equal('<!--[if IE lt 9]>weeee<![endif]-->', pug.render('<!--[if IE lt 9]>weeee<![endif]-->'));
+    it('should support literal html', function() {
+      assert.equal(
+        '<!--[if IE lt 9]>weeee<![endif]-->',
+        pug.render('<!--[if IE lt 9]>weeee<![endif]-->')
+      );
     });
 
-    it('should support code', function(){
+    it('should support code', function() {
       assert.equal('test', pug.render('!= "test"'));
       assert.equal('test', pug.render('= "test"'));
       assert.equal('test', pug.render('- var foo = "test"\n=foo'));
-      assert.equal('foo<em>test</em>bar', pug.render('- var foo = "test"\n| foo\nem= foo\n| bar'));
-      assert.equal('test<h2>something</h2>', pug.render('!= "test"\nh2 something'));
+      assert.equal(
+        'foo<em>test</em>bar',
+        pug.render('- var foo = "test"\n| foo\nem= foo\n| bar')
+      );
+      assert.equal(
+        'test<h2>something</h2>',
+        pug.render('!= "test"\nh2 something')
+      );
 
-      var str = [
-          '- var foo = "<script>";',
-          '= foo',
-          '!= foo'
-      ].join('\n');
+      var str = ['- var foo = "<script>";', '= foo', '!= foo'].join('\n');
 
-      var html = [
-          '&lt;script&gt;',
-          '<script>'
-      ].join('');
+      var html = ['&lt;script&gt;', '<script>'].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          '- var foo = "<script>";',
-          '- if (foo)',
-          '  p= foo'
-      ].join('\n');
+      var str = ['- var foo = "<script>";', '- if (foo)', '  p= foo'].join(
+        '\n'
+      );
 
-      var html = [
-          '<p>&lt;script&gt;</p>'
-      ].join('');
+      var html = ['<p>&lt;script&gt;</p>'].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          '- var foo = "<script>";',
-          '- if (foo)',
-          '  p!= foo'
-      ].join('\n');
+      var str = ['- var foo = "<script>";', '- if (foo)', '  p!= foo'].join(
+        '\n'
+      );
 
-      var html = [
-          '<p><script></p>'
-      ].join('');
+      var html = ['<p><script></p>'].join('');
 
       assert.equal(html, pug.render(str));
 
       var str = [
-          '- var foo;',
-          '- if (foo)',
-          '  p.hasFoo= foo',
-          '- else',
-          '  p.noFoo no foo'
+        '- var foo;',
+        '- if (foo)',
+        '  p.hasFoo= foo',
+        '- else',
+        '  p.noFoo no foo',
       ].join('\n');
 
-      var html = [
-          '<p class="noFoo">no foo</p>'
-      ].join('');
+      var html = ['<p class="noFoo">no foo</p>'].join('');
 
       assert.equal(html, pug.render(str));
 
       var str = [
-          '- var foo;',
-          '- if (foo)',
-          '  p.hasFoo= foo',
-          '- else if (true)',
-          '  p kinda foo',
-          '- else',
-          '  p.noFoo no foo'
+        '- var foo;',
+        '- if (foo)',
+        '  p.hasFoo= foo',
+        '- else if (true)',
+        '  p kinda foo',
+        '- else',
+        '  p.noFoo no foo',
       ].join('\n');
 
-      var html = [
-          '<p>kinda foo</p>'
-      ].join('');
+      var html = ['<p>kinda foo</p>'].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          'p foo',
-          '= "bar"',
-      ].join('\n');
+      var str = ['p foo', '= "bar"'].join('\n');
 
-      var html = [
-          '<p>foo</p>bar'
-      ].join('');
+      var html = ['<p>foo</p>bar'].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          'title foo',
-          '- if (true)',
-          '  p something',
-      ].join('\n');
+      var str = ['title foo', '- if (true)', '  p something'].join('\n');
 
-      var html = [
-          '<title>foo</title><p>something</p>'
-      ].join('');
+      var html = ['<title>foo</title><p>something</p>'].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          'foo',
-          '  bar= "bar"',
-          '    baz= "baz"',
-      ].join('\n');
+      var str = ['foo', '  bar= "bar"', '    baz= "baz"'].join('\n');
 
       var html = [
-          '<foo>',
-          '<bar>bar',
-          '<baz>baz</baz>',
-          '</bar>',
-          '</foo>'
+        '<foo>',
+        '<bar>bar',
+        '<baz>baz</baz>',
+        '</bar>',
+        '</foo>',
       ].join('');
 
       assert.equal(html, pug.render(str));
 
-      var str = [
-          '-',
-          '  var a =',
-          '    5;',
-          'p= a'
-      ].join('\n')
+      var str = ['-', '  var a =', '    5;', 'p= a'].join('\n');
 
-      var html = [
-          '<p>5</p>'
-      ].join('');
+      var html = ['<p>5</p>'].join('');
 
       assert.equal(html, pug.render(str));
     });
 
-    it('should support each', function(){
+    it('should support each', function() {
       // Array
       var str = [
-          '- var items = ["one", "two", "three"];',
-          'each item in items',
-          '  li= item'
+        '- var items = ["one", "two", "three"];',
+        'each item in items',
+        '  li= item',
       ].join('\n');
 
-      var html = [
-          '<li>one</li>',
-          '<li>two</li>',
-          '<li>three</li>'
-      ].join('');
+      var html = ['<li>one</li>', '<li>two</li>', '<li>three</li>'].join('');
 
       assert.equal(html, pug.render(str));
 
       // Any enumerable (length property)
       var str = [
-          '- var jQuery = { length: 3, 0: 1, 1: 2, 2: 3 };',
-          'each item in jQuery',
-          '  li= item'
+        '- var jQuery = { length: 3, 0: 1, 1: 2, 2: 3 };',
+        'each item in jQuery',
+        '  li= item',
       ].join('\n');
 
-      var html = [
-          '<li>1</li>',
-          '<li>2</li>',
-          '<li>3</li>'
-      ].join('');
+      var html = ['<li>1</li>', '<li>2</li>', '<li>3</li>'].join('');
 
       assert.equal(html, pug.render(str));
 
       // Empty array
-      var str = [
-          '- var items = [];',
-          'each item in items',
-          '  li= item'
-      ].join('\n');
+      var str = ['- var items = [];', 'each item in items', '  li= item'].join(
+        '\n'
+      );
 
       assert.equal('', pug.render(str));
 
       // Object
       var str = [
-          '- var obj = { foo: "bar", baz: "raz" };',
-          'each val in obj',
-          '  li= val'
+        '- var obj = { foo: "bar", baz: "raz" };',
+        'each val in obj',
+        '  li= val',
       ].join('\n');
 
-      var html = [
-          '<li>bar</li>',
-          '<li>raz</li>'
-      ].join('');
+      var html = ['<li>bar</li>', '<li>raz</li>'].join('');
 
       assert.equal(html, pug.render(str));
 
       // Complex
       var str = [
-          '- var obj = { foo: "bar", baz: "raz" };',
-          'each key in Object.keys(obj)',
-          '  li= key'
+        '- var obj = { foo: "bar", baz: "raz" };',
+        'each key in Object.keys(obj)',
+        '  li= key',
       ].join('\n');
 
-      var html = [
-          '<li>foo</li>',
-          '<li>baz</li>'
-      ].join('');
+      var html = ['<li>foo</li>', '<li>baz</li>'].join('');
 
       assert.equal(html, pug.render(str));
 
       // Keys
       var str = [
-          '- var obj = { foo: "bar", baz: "raz" };',
-          'each val, key in obj',
-          '  li #{key}: #{val}'
+        '- var obj = { foo: "bar", baz: "raz" };',
+        'each val, key in obj',
+        '  li #{key}: #{val}',
       ].join('\n');
 
-      var html = [
-          '<li>foo: bar</li>',
-          '<li>baz: raz</li>'
-      ].join('');
+      var html = ['<li>foo: bar</li>', '<li>baz: raz</li>'].join('');
 
       assert.equal(html, pug.render(str));
 
       // Nested
       var str = [
-          '- var users = [{ name: "tj" }]',
-          'each user in users',
-          '  each val, key in user',
-          '    li #{key} #{val}',
+        '- var users = [{ name: "tj" }]',
+        'each user in users',
+        '  each val, key in user',
+        '    li #{key} #{val}',
       ].join('\n');
 
-      var html = [
-          '<li>name tj</li>'
-      ].join('');
+      var html = ['<li>name tj</li>'].join('');
 
       assert.equal(html, pug.render(str));
 
       var str = [
-          '- var users = ["tobi", "loki", "jane"]',
-          'each user in users',
-          '  li= user',
+        '- var users = ["tobi", "loki", "jane"]',
+        'each user in users',
+        '  li= user',
       ].join('\n');
 
-      var html = [
-          '<li>tobi</li>',
-          '<li>loki</li>',
-          '<li>jane</li>',
-      ].join('');
+      var html = ['<li>tobi</li>', '<li>loki</li>', '<li>jane</li>'].join('');
 
       assert.equal(html, pug.render(str));
 
       var str = [
-          '- var users = ["tobi", "loki", "jane"]',
-          'for user in users',
-          '  li= user',
+        '- var users = ["tobi", "loki", "jane"]',
+        'for user in users',
+        '  li= user',
       ].join('\n');
 
-      var html = [
-          '<li>tobi</li>',
-          '<li>loki</li>',
-          '<li>jane</li>',
-      ].join('');
+      var html = ['<li>tobi</li>', '<li>loki</li>', '<li>jane</li>'].join('');
 
       assert.equal(html, pug.render(str));
     });
 
-    it('should support if', function(){
+    it('should support if', function() {
       var str = [
-          '- var users = ["tobi", "loki", "jane"]',
-          'if users.length',
-          '  p users: #{users.length}',
+        '- var users = ["tobi", "loki", "jane"]',
+        'if users.length',
+        '  p users: #{users.length}',
       ].join('\n');
 
       assert.equal('<p>users: 3</p>', pug.render(str));
 
-      assert.equal('<iframe foo="bar"></iframe>', pug.render('iframe(foo="bar")'));
+      assert.equal(
+        '<iframe foo="bar"></iframe>',
+        pug.render('iframe(foo="bar")')
+      );
     });
 
-    it('should support unless', function(){
+    it('should support unless', function() {
       var str = [
-          '- var users = ["tobi", "loki", "jane"]',
-          'unless users.length',
-          '  p no users',
+        '- var users = ["tobi", "loki", "jane"]',
+        'unless users.length',
+        '  p no users',
       ].join('\n');
 
       assert.equal('', pug.render(str));
 
       var str = [
-          '- var users = []',
-          'unless users.length',
-          '  p no users',
+        '- var users = []',
+        'unless users.length',
+        '  p no users',
       ].join('\n');
 
       assert.equal('<p>no users</p>', pug.render(str));
     });
 
-    it('should support else', function(){
+    it('should support else', function() {
       var str = [
-          '- var users = []',
-          'if users.length',
-          '  p users: #{users.length}',
-          'else',
-          '  p users: none',
+        '- var users = []',
+        'if users.length',
+        '  p users: #{users.length}',
+        'else',
+        '  p users: none',
       ].join('\n');
 
       assert.equal('<p>users: none</p>', pug.render(str));
     });
 
-    it('should else if', function(){
+    it('should else if', function() {
       var str = [
-          '- var users = ["tobi", "jane", "loki"]',
-          'for user in users',
-          '  if user == "tobi"',
-          '    p awesome #{user}',
-          '  else if user == "jane"',
-          '    p lame #{user}',
-          '  else',
-          '    p #{user}',
+        '- var users = ["tobi", "jane", "loki"]',
+        'for user in users',
+        '  if user == "tobi"',
+        '    p awesome #{user}',
+        '  else if user == "jane"',
+        '    p lame #{user}',
+        '  else',
+        '    p #{user}',
       ].join('\n');
 
-      assert.equal('<p>awesome tobi</p><p>lame jane</p><p>loki</p>', pug.render(str));
+      assert.equal(
+        '<p>awesome tobi</p><p>lame jane</p><p>loki</p>',
+        pug.render(str)
+      );
     });
 
-    it('should include block', function(){
+    it('should include block', function() {
       var str = [
-          'html',
-          '  head',
-          '    include fixtures/scripts.pug',
-          '      scripts(src="/app.js")',
+        'html',
+        '  head',
+        '    include fixtures/scripts.pug',
+        '      scripts(src="/app.js")',
       ].join('\n');
 
-      assert.equal('<html><head><script src=\"/jquery.js\"></script><script src=\"/caustic.js\"></script><scripts src=\"/app.js\"></scripts></head></html>'
-      , pug.render(str, { filename: __dirname + '/pug.test.js' }));
+      assert.equal(
+        '<html><head><script src="/jquery.js"></script><script src="/caustic.js"></script><scripts src="/app.js"></scripts></head></html>',
+        pug.render(str, {filename: __dirname + '/pug.test.js'})
+      );
     });
 
-    it('should not fail on js newlines', function(){
-      assert.equal("<p>foo\u2028bar</p>", pug.render("p foo\u2028bar"));
-      assert.equal("<p>foo\u2029bar</p>", pug.render("p foo\u2029bar"));
+    it('should not fail on js newlines', function() {
+      assert.equal('<p>foo\u2028bar</p>', pug.render('p foo\u2028bar'));
+      assert.equal('<p>foo\u2029bar</p>', pug.render('p foo\u2029bar'));
     });
 
     it('should display error line number correctly up to token level', function() {
@@ -882,235 +1113,323 @@ describe('pug', function(){
           return err.message.split('\n')[0];
         }
       };
-      assert.equal(errorLocation(str), "Pug:13:16");
+      assert.equal(errorLocation(str), 'Pug:13:16');
     });
   });
 
-  describe('.compileFile()', function () {
-    it('does not produce warnings for issue-1593', function () {
+  describe('.compileFile()', function() {
+    it('does not produce warnings for issue-1593', function() {
       pug.compileFile(__dirname + '/fixtures/issue-1593/index.pug');
     });
-    it('should support caching (pass 1)', function () {
+    it('should support caching (pass 1)', function() {
       fs.writeFileSync(__dirname + '/temp/input-compileFile.pug', '.foo bar');
-      var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug',
-                                { cache: true });
+      var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug', {
+        cache: true,
+      });
       var expected = '<div class="foo">bar</div>';
       assert(fn() === expected);
     });
-    it('should support caching (pass 2)', function () {
+    it('should support caching (pass 2)', function() {
       // Poison the input file
-      fs.writeFileSync(__dirname + '/temp/input-compileFile.pug', '.big fat hen');
-      var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug',
-                                { cache: true });
+      fs.writeFileSync(
+        __dirname + '/temp/input-compileFile.pug',
+        '.big fat hen'
+      );
+      var fn = pug.compileFile(__dirname + '/temp/input-compileFile.pug', {
+        cache: true,
+      });
       var expected = '<div class="foo">bar</div>';
       assert(fn() === expected);
     });
   });
 
-  describe('.render()', function () {
-    it('should support .pug.render(str, fn)', function(){
-      pug.render('p foo bar', function(err, str){
+  describe('.render()', function() {
+    it('should support .pug.render(str, fn)', function() {
+      pug.render('p foo bar', function(err, str) {
         assert.ok(!err);
         assert.equal('<p>foo bar</p>', str);
       });
     });
 
-    it('should support .pug.render(str, options, fn)', function(){
-      pug.render('p #{foo}', { foo: 'bar' }, function(err, str){
+    it('should support .pug.render(str, options, fn)', function() {
+      pug.render('p #{foo}', {foo: 'bar'}, function(err, str) {
         assert.ok(!err);
         assert.equal('<p>bar</p>', str);
       });
     });
 
-    it('should support .pug.render(str, options, fn) cache', function(){
-      pug.render('p bar', { cache: true }, function(err, str){
-        assert.ok(/the "filename" option is required for caching/.test(err.message));
+    it('should support .pug.render(str, options, fn) cache', function() {
+      pug.render('p bar', {cache: true}, function(err, str) {
+        assert.ok(
+          /the "filename" option is required for caching/.test(err.message)
+        );
       });
 
-      pug.render('p foo bar', { cache: true, filename: 'test' }, function(err, str){
+      pug.render('p foo bar', {cache: true, filename: 'test'}, function(
+        err,
+        str
+      ) {
         assert.ok(!err);
         assert.equal('<p>foo bar</p>', str);
       });
     });
-  })
+  });
 
-  describe('.compile()', function(){
-    it('should support .compile()', function(){
+  describe('.compile()', function() {
+    it('should support .compile()', function() {
       var fn = pug.compile('p foo');
       assert.equal('<p>foo</p>', fn());
     });
 
-    it('should support .compile() locals', function(){
+    it('should support .compile() locals', function() {
       var fn = pug.compile('p= foo');
-      assert.equal('<p>bar</p>', fn({ foo: 'bar' }));
+      assert.equal('<p>bar</p>', fn({foo: 'bar'}));
     });
 
-    it('should support .compile() locals in \'self\' hash', function(){
+    it("should support .compile() locals in 'self' hash", function() {
       var fn = pug.compile('p= self.foo', {self: true});
-      assert.equal('<p>bar</p>', fn({ foo: 'bar' }));
+      assert.equal('<p>bar</p>', fn({foo: 'bar'}));
     });
 
-    it('should support .compile() no debug', function(){
+    it('should support .compile() no debug', function() {
       var fn = pug.compile('p foo\np #{bar}', {compileDebug: false});
       assert.equal('<p>foo</p><p>baz</p>', fn({bar: 'baz'}));
     });
 
-    it('should support .compile() no debug and global helpers', function(){
-      var fn = pug.compile('p foo\np #{bar}', {compileDebug: false, helpers: 'global'});
+    it('should support .compile() no debug and global helpers', function() {
+      var fn = pug.compile('p foo\np #{bar}', {
+        compileDebug: false,
+        helpers: 'global',
+      });
       assert.equal('<p>foo</p><p>baz</p>', fn({bar: 'baz'}));
     });
 
-    it('should be reasonably fast', function(){
-      pug.compile(perfTest, {})
+    it('should be reasonably fast', function() {
+      pug.compile(perfTest, {});
     });
-    it('allows trailing space (see #1586)', function () {
+    it('allows trailing space (see #1586)', function() {
       var res = pug.render('ul \n  li An Item');
       assert.equal('<ul> <li>An Item</li></ul>', res);
     });
   });
 
-  describe('.compileClient()', function () {
-    it('should support pug.compileClient(str)', function () {
+  describe('.compileClient()', function() {
+    it('should support pug.compileClient(str)', function() {
       var src = fs.readFileSync(__dirname + '/cases/basic.pug');
-      var expected = fs.readFileSync(__dirname + '/cases/basic.html', 'utf8').replace(/\s/g, '');
+      var expected = fs
+        .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+        .replace(/\s/g, '');
       var fn = pug.compileClient(src);
       fn = Function('pug', fn.toString() + '\nreturn template;')(pug.runtime);
       var actual = fn({name: 'foo'}).replace(/\s/g, '');
       expect(actual).toBe(expected);
     });
-    it('should support pug.compileClient(str, options)', function () {
+    it('should support pug.compileClient(str, options)', function() {
       var src = '.bar= self.foo';
       var fn = pug.compileClient(src, {self: true});
       fn = Function('pug', fn.toString() + '\nreturn template;')(pug.runtime);
       var actual = fn({foo: 'baz'});
       expect(actual).toBe('<div class="bar">baz</div>');
     });
-    it('should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true', function () {
+    it('should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true', function() {
       var src = '.bar= self.foo';
-      var fn = pug.compileClient(src, {self: true, module: true, inlineRuntimeFunctions: true});
+      var fn = pug.compileClient(src, {
+        self: true,
+        module: true,
+        inlineRuntimeFunctions: true,
+      });
       expect(fn).toMatchSnapshot();
-      fs.writeFileSync(__dirname + '/temp/input-compileModuleFileClient.js', fn);
+      fs.writeFileSync(
+        __dirname + '/temp/input-compileModuleFileClient.js',
+        fn
+      );
       var expected = '<div class="bar">baz</div>';
       var fn = require(__dirname + '/temp/input-compileModuleFileClient.js');
       expect(fn({foo: 'baz'})).toBe('<div class="bar">baz</div>');
     });
-    it('should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false', function () {
+    it('should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false', function() {
       var src = '.bar= self.foo';
-      var fn = pug.compileClient(src, {self: true, module: true, inlineRuntimeFunctions: false});
+      var fn = pug.compileClient(src, {
+        self: true,
+        module: true,
+        inlineRuntimeFunctions: false,
+      });
       expect(fn).toMatchSnapshot();
-      fs.writeFileSync(__dirname + '/temp/input-compileModuleFileClient.js', fn);
+      fs.writeFileSync(
+        __dirname + '/temp/input-compileModuleFileClient.js',
+        fn
+      );
       var fn = require(__dirname + '/temp/input-compileModuleFileClient.js');
       expect(fn({foo: 'baz'})).toBe('<div class="bar">baz</div>');
     });
   });
 
-  describe('.renderFile()', function () {
-    it('will synchronously return a string', function () {
-      var expected = fs.readFileSync(__dirname + '/cases/basic.html', 'utf8').replace(/\s/g, '');
-      var actual = pug.renderFile(__dirname + '/cases/basic.pug', {name: 'foo'}).replace(/\s/g, '');
+  describe('.renderFile()', function() {
+    it('will synchronously return a string', function() {
+      var expected = fs
+        .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+        .replace(/\s/g, '');
+      var actual = pug
+        .renderFile(__dirname + '/cases/basic.pug', {name: 'foo'})
+        .replace(/\s/g, '');
       assert(actual === expected);
     });
-    it('when given a callback, it calls that rather than returning', function (done) {
-      var expected = fs.readFileSync(__dirname + '/cases/basic.html', 'utf8').replace(/\s/g, '');
-      pug.renderFile(__dirname + '/cases/basic.pug', {name: 'foo'}, function (err, actual) {
+    it('when given a callback, it calls that rather than returning', function(done) {
+      var expected = fs
+        .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+        .replace(/\s/g, '');
+      pug.renderFile(__dirname + '/cases/basic.pug', {name: 'foo'}, function(
+        err,
+        actual
+      ) {
         if (err) return done(err);
         assert(actual.replace(/\s/g, '') === expected);
         done();
       });
     });
-    it('when given a callback, it calls that rather than returning even if there are no options', function (done) {
-      var expected = fs.readFileSync(__dirname + '/cases/basic.html', 'utf8').replace(/\s/g, '');
-      pug.renderFile(__dirname + '/cases/basic.pug', function (err, actual) {
+    it('when given a callback, it calls that rather than returning even if there are no options', function(done) {
+      var expected = fs
+        .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+        .replace(/\s/g, '');
+      pug.renderFile(__dirname + '/cases/basic.pug', function(err, actual) {
         if (err) return done(err);
         assert(actual.replace(/\s/g, '') === expected);
         done();
       });
     });
-    it('when given a callback, it calls that with any errors', function (done) {
-      pug.renderFile(__dirname + '/fixtures/runtime.error.pug', function (err, actual) {
+    it('when given a callback, it calls that with any errors', function(done) {
+      pug.renderFile(__dirname + '/fixtures/runtime.error.pug', function(
+        err,
+        actual
+      ) {
         assert.ok(err);
         done();
       });
     });
-    it('should support caching (pass 1)', function (done) {
+    it('should support caching (pass 1)', function(done) {
       fs.writeFileSync(__dirname + '/temp/input-renderFile.pug', '.foo bar');
-      pug.renderFile(__dirname + '/temp/input-renderFile.pug', { cache: true }, function (err, actual) {
-        if (err) return done(err);
-        assert.equal('<div class="foo">bar</div>', actual);
-        done();
-      });
+      pug.renderFile(
+        __dirname + '/temp/input-renderFile.pug',
+        {cache: true},
+        function(err, actual) {
+          if (err) return done(err);
+          assert.equal('<div class="foo">bar</div>', actual);
+          done();
+        }
+      );
     });
-    it('should support caching (pass 2)', function (done) {
+    it('should support caching (pass 2)', function(done) {
       // Poison the input file
-      fs.writeFileSync(__dirname + '/temp/input-renderFile.pug', '.big fat hen');
-      pug.renderFile(__dirname + '/temp/input-renderFile.pug', { cache: true }, function (err, actual) {
-        if (err) return done(err);
-        assert.equal('<div class="foo">bar</div>', actual);
-        done();
-      });
+      fs.writeFileSync(
+        __dirname + '/temp/input-renderFile.pug',
+        '.big fat hen'
+      );
+      pug.renderFile(
+        __dirname + '/temp/input-renderFile.pug',
+        {cache: true},
+        function(err, actual) {
+          if (err) return done(err);
+          assert.equal('<div class="foo">bar</div>', actual);
+          done();
+        }
+      );
     });
   });
 
-  describe('.compileFileClient(path, options)', function () {
-    it('returns a string form of a function called `template`', function () {
+  describe('.compileFileClient(path, options)', function() {
+    it('returns a string form of a function called `template`', function() {
       var src = pug.compileFileClient(__dirname + '/cases/basic.pug');
-      var expected = fs.readFileSync(__dirname + '/cases/basic.html', 'utf8').replace(/\s/g, '');
+      var expected = fs
+        .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+        .replace(/\s/g, '');
       var fn = Function('pug', src + '\nreturn template;')(pug.runtime);
       var actual = fn({name: 'foo'}).replace(/\s/g, '');
       assert(actual === expected);
     });
-    it('accepts the `name` option to rename the resulting function', function () {
-      var src = pug.compileFileClient(__dirname + '/cases/basic.pug', {name: 'myTemplateName'});
-      var expected = fs.readFileSync(__dirname + '/cases/basic.html', 'utf8').replace(/\s/g, '');
+    it('accepts the `name` option to rename the resulting function', function() {
+      var src = pug.compileFileClient(__dirname + '/cases/basic.pug', {
+        name: 'myTemplateName',
+      });
+      var expected = fs
+        .readFileSync(__dirname + '/cases/basic.html', 'utf8')
+        .replace(/\s/g, '');
       var fn = Function('pug', src + '\nreturn myTemplateName;')(pug.runtime);
       var actual = fn({name: 'foo'}).replace(/\s/g, '');
       assert(actual === expected);
     });
-    it('should support caching (pass 1)', function () {
-      fs.writeFileSync(__dirname + '/temp/input-compileFileClient.pug', '.foo bar');
-      var src = pug.compileFileClient(__dirname + '/temp/input-compileFileClient.pug',
-                                        { name: 'myTemplateName',
-                                          cache: true });
+    it('should support caching (pass 1)', function() {
+      fs.writeFileSync(
+        __dirname + '/temp/input-compileFileClient.pug',
+        '.foo bar'
+      );
+      var src = pug.compileFileClient(
+        __dirname + '/temp/input-compileFileClient.pug',
+        {name: 'myTemplateName', cache: true}
+      );
       var expected = '<div class="foo">bar</div>';
       var fn = Function('pug', src + '\nreturn myTemplateName;')(pug.runtime);
       assert(fn() === expected);
     });
-    it('should support caching (pass 2)', function () {
+    it('should support caching (pass 2)', function() {
       // Poison the input file
-      fs.writeFileSync(__dirname + '/temp/input-compileFileClient.pug', '.big fat hen');
-      var src = pug.compileFileClient(__dirname + '/temp/input-compileFileClient.pug',
-                                        { name: 'myTemplateName',
-                                          cache: true });
+      fs.writeFileSync(
+        __dirname + '/temp/input-compileFileClient.pug',
+        '.big fat hen'
+      );
+      var src = pug.compileFileClient(
+        __dirname + '/temp/input-compileFileClient.pug',
+        {name: 'myTemplateName', cache: true}
+      );
       var expected = '<div class="foo">bar</div>';
       var fn = Function('pug', src + '\nreturn myTemplateName;')(pug.runtime);
       assert(fn() === expected);
     });
   });
 
-  describe('.runtime', function () {
-    describe('.merge', function () {
-      it('merges two attribute objects, giving precedensce to the second object', function () {
-        assert.deepEqual(pug.runtime.merge({}, {'class': ['foo', 'bar'], 'foo': 'bar'}), {'class': ['foo', 'bar'], 'foo': 'bar'});
-        assert.deepEqual(pug.runtime.merge({'class': ['foo'], 'foo': 'baz'}, {'class': ['bar'], 'foo': 'bar'}), {'class': ['foo', 'bar'], 'foo': 'bar'});
-        assert.deepEqual(pug.runtime.merge({'class': ['foo', 'bar'], 'foo': 'bar'}, {}), {'class': ['foo', 'bar'], 'foo': 'bar'});
+  describe('.runtime', function() {
+    describe('.merge', function() {
+      it('merges two attribute objects, giving precedensce to the second object', function() {
+        assert.deepEqual(
+          pug.runtime.merge({}, {class: ['foo', 'bar'], foo: 'bar'}),
+          {class: ['foo', 'bar'], foo: 'bar'}
+        );
+        assert.deepEqual(
+          pug.runtime.merge(
+            {class: ['foo'], foo: 'baz'},
+            {class: ['bar'], foo: 'bar'}
+          ),
+          {class: ['foo', 'bar'], foo: 'bar'}
+        );
+        assert.deepEqual(
+          pug.runtime.merge({class: ['foo', 'bar'], foo: 'bar'}, {}),
+          {class: ['foo', 'bar'], foo: 'bar'}
+        );
       });
     });
-    describe('.attrs', function () {
-      it('Renders the given attributes object', function () {
+    describe('.attrs', function() {
+      it('Renders the given attributes object', function() {
         assert.equal(pug.runtime.attrs({}), '');
-        assert.equal(pug.runtime.attrs({'class': []}), '');
-        assert.equal(pug.runtime.attrs({'class': ['foo']}), ' class="foo"');
-        assert.equal(pug.runtime.attrs({'class': ['foo'], 'id': 'bar'}), ' class="foo" id="bar"');
+        assert.equal(pug.runtime.attrs({class: []}), '');
+        assert.equal(pug.runtime.attrs({class: ['foo']}), ' class="foo"');
+        assert.equal(
+          pug.runtime.attrs({class: ['foo'], id: 'bar'}),
+          ' class="foo" id="bar"'
+        );
       });
     });
   });
 
-  describe('filter indentation', function () {
-    it('is maintained', function () {
+  describe('filter indentation', function() {
+    it('is maintained', function() {
       var filters = {
-        indents: function(str){
-          return str.split(/\n/).map(function (line) { return line.match(/^ */)[0].length; }).join(",");
-        }
+        indents: function(str) {
+          return str
+            .split(/\n/)
+            .map(function(line) {
+              return line.match(/^ */)[0].length;
+            })
+            .join(',');
+        },
       };
 
       var indents = [
@@ -1129,47 +1448,58 @@ describe('pug', function(){
         '  x',
         '    x',
         '  x',
-        '   x'
+        '   x',
       ].join('\n');
 
-      assert.equal(pug.render(indents, {filters: filters}), '0,1,2,3,0,4,4,3,3,4,2,0,2,0,1');
+      assert.equal(
+        pug.render(indents, {filters: filters}),
+        '0,1,2,3,0,4,4,3,3,4,2,0,2,0,1'
+      );
     });
   });
 
   describe('.compile().dependencies', function() {
-    it('should list the filename of the template referenced by extends', function(){
+    it('should list the filename of the template referenced by extends', function() {
       var filename = __dirname + '/dependencies/extends1.pug';
       var str = fs.readFileSync(filename, 'utf8');
       var info = pug.compile(str, {filename: filename});
-      assert.deepEqual([
-        path.resolve(__dirname + '/dependencies/dependency1.pug')
-      ], info.dependencies);
+      assert.deepEqual(
+        [path.resolve(__dirname + '/dependencies/dependency1.pug')],
+        info.dependencies
+      );
     });
     it('should list the filename of the template referenced by an include', function() {
       var filename = __dirname + '/dependencies/include1.pug';
       var str = fs.readFileSync(filename, 'utf8');
       var info = pug.compile(str, {filename: filename});
-      assert.deepEqual([
-        path.resolve(__dirname + '/dependencies/dependency1.pug')
-      ], info.dependencies);
+      assert.deepEqual(
+        [path.resolve(__dirname + '/dependencies/dependency1.pug')],
+        info.dependencies
+      );
     });
     it('should list the dependencies of extends dependencies', function() {
       var filename = __dirname + '/dependencies/extends2.pug';
       var str = fs.readFileSync(filename, 'utf8');
       var info = pug.compile(str, {filename: filename});
-      assert.deepEqual([
-        path.resolve(__dirname + '/dependencies/dependency2.pug'),
-        path.resolve(__dirname + '/dependencies/dependency3.pug')
-      ], info.dependencies);
+      assert.deepEqual(
+        [
+          path.resolve(__dirname + '/dependencies/dependency2.pug'),
+          path.resolve(__dirname + '/dependencies/dependency3.pug'),
+        ],
+        info.dependencies
+      );
     });
     it('should list the dependencies of include dependencies', function() {
       var filename = __dirname + '/dependencies/include2.pug';
       var str = fs.readFileSync(filename, 'utf8');
       var info = pug.compile(str, {filename: filename});
-      assert.deepEqual([
-        path.resolve(__dirname + '/dependencies/dependency2.pug'),
-        path.resolve(__dirname + '/dependencies/dependency3.pug')
-      ],info.dependencies);
+      assert.deepEqual(
+        [
+          path.resolve(__dirname + '/dependencies/dependency2.pug'),
+          path.resolve(__dirname + '/dependencies/dependency3.pug'),
+        ],
+        info.dependencies
+      );
     });
   });
 
diff --git a/packages/pug/test/regression-2436/index.test.js b/packages/pug/test/regression-2436/index.test.js
index 47a1ae44b..d9647b83b 100644
--- a/packages/pug/test/regression-2436/index.test.js
+++ b/packages/pug/test/regression-2436/index.test.js
@@ -1,17 +1,11 @@
 const pug = require('../../');
 
 test('#2436 - block with a same name extends from the same layout in nesting', () => {
-    const output = pug.renderFile(
-        __dirname + '/issue1.pug',
-        {pretty: true}
-    );
-    expect(output).toMatchSnapshot();
+  const output = pug.renderFile(__dirname + '/issue1.pug', {pretty: true});
+  expect(output).toMatchSnapshot();
 });
 
 test('#2436 - block with a same name extends from different layout in nesting', () => {
-    const output = pug.renderFile(
-        __dirname + '/issue2.pug',
-        {pretty: true}
-    );
-    expect(output).toMatchSnapshot();
+  const output = pug.renderFile(__dirname + '/issue2.pug', {pretty: true});
+  expect(output).toMatchSnapshot();
 });
diff --git a/packages/pug/test/run-es2015.test.js b/packages/pug/test/run-es2015.test.js
index 0ab14df5d..0ee3d35bc 100644
--- a/packages/pug/test/run-es2015.test.js
+++ b/packages/pug/test/run-es2015.test.js
@@ -11,7 +11,7 @@ var es2015 = runUtils.findCases(__dirname + '/cases-es2015');
 
 mkdirp(__dirname + '/output-es2015');
 
-describe('test cases for ECMAScript 2015', function () {
+describe('test cases for ECMAScript 2015', function() {
   try {
     eval('``');
     es2015.forEach(runUtils.testSingle.bind(null, it, '-es2015'));
diff --git a/packages/pug/test/run-syntax-errors.test.js b/packages/pug/test/run-syntax-errors.test.js
index 8a0a54a18..379750cdd 100644
--- a/packages/pug/test/run-syntax-errors.test.js
+++ b/packages/pug/test/run-syntax-errors.test.js
@@ -5,10 +5,10 @@ const pug = require('../');
 
 const anti = runUtils.findCases(__dirname + '/anti-cases');
 
-describe('certain syntax is not allowed and will throw a compile time error', function () {
-  anti.forEach(function(test){
+describe('certain syntax is not allowed and will throw a compile time error', function() {
+  anti.forEach(function(test) {
     var name = test.replace(/[-.]/g, ' ');
-    it(name, function(){
+    it(name, function() {
       var path = __dirname.replace(/\\/g, '/') + '/anti-cases/' + test + '.pug';
       var str = fs.readFileSync(path, 'utf8');
       try {
@@ -16,19 +16,28 @@ describe('certain syntax is not allowed and will throw a compile time error', fu
           filename: path,
           pretty: true,
           basedir: __dirname + '/anti-cases',
-          filters: runUtils.filters
+          filters: runUtils.filters,
         });
       } catch (ex) {
         if (!ex.code) {
           throw ex;
         }
         assert(ex instanceof Error, 'Should throw a real Error');
-        assert(ex.code.indexOf('PUG:') === 0, 'It should have a code of "PUG:SOMETHING"');
-        assert(ex.message.replace(/\\/g, '/').indexOf(path) === 0, 'it should start with the path');
-        assert(/:\d+$/m.test(ex.message.replace(/\\/g, '/')), 'it should include a line number.');
+        assert(
+          ex.code.indexOf('PUG:') === 0,
+          'It should have a code of "PUG:SOMETHING"'
+        );
+        assert(
+          ex.message.replace(/\\/g, '/').indexOf(path) === 0,
+          'it should start with the path'
+        );
+        assert(
+          /:\d+$/m.test(ex.message.replace(/\\/g, '/')),
+          'it should include a line number.'
+        );
         return;
       }
       throw new Error(test + ' should have thrown an error');
-    })
+    });
   });
 });
diff --git a/packages/pug/test/run-utils.js b/packages/pug/test/run-utils.js
index 53078981f..2d1eccf3e 100644
--- a/packages/pug/test/run-utils.js
+++ b/packages/pug/test/run-utils.js
@@ -5,11 +5,11 @@ var uglify = require('uglify-js');
 var mkdirp = require('mkdirp').sync;
 
 var filters = {
-  custom: function (str, options) {
+  custom: function(str, options) {
     assert(options.opt === 'val');
     assert(options.num === 2);
     return 'BEGIN' + str + 'END';
-  }
+  },
 };
 
 // test cases
@@ -28,16 +28,19 @@ function writeFileSync(filename, data) {
 }
 
 function findCases(dir) {
-  return fs.readdirSync(dir).filter(function(file){
-    return ~file.indexOf('.pug');
-  }).map(function(file){
-    return file.replace('.pug', '');
-  });
+  return fs
+    .readdirSync(dir)
+    .filter(function(file) {
+      return ~file.indexOf('.pug');
+    })
+    .map(function(file) {
+      return file.replace('.pug', '');
+    });
 }
 
-function testSingle(it, suffix, test){
+function testSingle(it, suffix, test) {
   var name = test.replace(/[-.]/g, ' ');
-  it(name, function(){
+  it(name, function() {
     var path = __dirname + '/cases' + suffix + '/' + test + '.pug';
     var str = fs.readFileSync(path, 'utf8');
     var fn = pug.compile(str, {
@@ -45,52 +48,98 @@ function testSingle(it, suffix, test){
       pretty: true,
       basedir: __dirname + '/cases' + suffix,
       filters: filters,
-      filterAliases: {'markdown': 'markdown-it'},
+      filterAliases: {markdown: 'markdown-it'},
     });
-    var actual = fn({ title: 'Pug' });
+    var actual = fn({title: 'Pug'});
 
-    writeFileSync(__dirname + '/output' + suffix + '/' + test + '.html', actual);
+    writeFileSync(
+      __dirname + '/output' + suffix + '/' + test + '.html',
+      actual
+    );
 
-    var html = fs.readFileSync(__dirname + '/cases' + suffix + '/' + test + '.html', 'utf8').trim().replace(/\r/g, '');
-    var clientCode = uglify.minify(pug.compileClient(str, {
-      filename: path,
-      pretty: true,
-      compileDebug: false,
-      basedir: __dirname + '/cases' + suffix,
-      filters: filters,
-      filterAliases: {'markdown': 'markdown-it'},
-    }), {output: {beautify: true}, mangle: false, compress: false, fromString: true}).code;
-    var clientCodeDebug = uglify.minify(pug.compileClient(str, {
-      filename: path,
-      pretty: true,
-      compileDebug: true,
-      basedir: __dirname + '/cases' + suffix,
-      filters: filters,
-      filterAliases: {'markdown': 'markdown-it'},
-    }), {output: {beautify: true}, mangle: false, compress: false, fromString: true}).code;
-    writeFileSync(__dirname + '/output' + suffix + '/' + test + '.js', uglify.minify(pug.compileClient(str, {
-      filename: path,
-      pretty: false,
-      compileDebug: false,
-      basedir: __dirname + '/cases' + suffix,
-      filters: filters,
-      filterAliases: {'markdown': 'markdown-it'},
-    }), {output: {beautify: true}, mangle: false, compress: false, fromString: true}).code);
+    var html = fs
+      .readFileSync(
+        __dirname + '/cases' + suffix + '/' + test + '.html',
+        'utf8'
+      )
+      .trim()
+      .replace(/\r/g, '');
+    var clientCode = uglify.minify(
+      pug.compileClient(str, {
+        filename: path,
+        pretty: true,
+        compileDebug: false,
+        basedir: __dirname + '/cases' + suffix,
+        filters: filters,
+        filterAliases: {markdown: 'markdown-it'},
+      }),
+      {
+        output: {beautify: true},
+        mangle: false,
+        compress: false,
+        fromString: true,
+      }
+    ).code;
+    var clientCodeDebug = uglify.minify(
+      pug.compileClient(str, {
+        filename: path,
+        pretty: true,
+        compileDebug: true,
+        basedir: __dirname + '/cases' + suffix,
+        filters: filters,
+        filterAliases: {markdown: 'markdown-it'},
+      }),
+      {
+        output: {beautify: true},
+        mangle: false,
+        compress: false,
+        fromString: true,
+      }
+    ).code;
+    writeFileSync(
+      __dirname + '/output' + suffix + '/' + test + '.js',
+      uglify.minify(
+        pug.compileClient(str, {
+          filename: path,
+          pretty: false,
+          compileDebug: false,
+          basedir: __dirname + '/cases' + suffix,
+          filters: filters,
+          filterAliases: {markdown: 'markdown-it'},
+        }),
+        {
+          output: {beautify: true},
+          mangle: false,
+          compress: false,
+          fromString: true,
+        }
+      ).code
+    );
     if (/filter/.test(test)) {
       actual = actual.replace(/\n| /g, '');
       html = html.replace(/\n| /g, '');
     }
     if (/mixins-unused/.test(test)) {
-      assert(/never-called/.test(str), 'never-called is in the pug file for mixins-unused');
-      assert(!/never-called/.test(clientCode), 'never-called should be removed from the code');
+      assert(
+        /never-called/.test(str),
+        'never-called is in the pug file for mixins-unused'
+      );
+      assert(
+        !/never-called/.test(clientCode),
+        'never-called should be removed from the code'
+      );
     }
     expect(actual.trim()).toEqual(html);
-    actual = Function('pug', clientCode + '\nreturn template;')()({ title: 'Pug' });
+    actual = Function('pug', clientCode + '\nreturn template;')()({
+      title: 'Pug',
+    });
     if (/filter/.test(test)) {
       actual = actual.replace(/\n| /g, '');
     }
     expect(actual.trim()).toEqual(html);
-    actual = Function('pug', clientCodeDebug + '\nreturn template;')()({ title: 'Pug' });
+    actual = Function('pug', clientCodeDebug + '\nreturn template;')()({
+      title: 'Pug',
+    });
     if (/filter/.test(test)) {
       actual = actual.replace(/\n| /g, '');
     }
@@ -98,7 +147,6 @@ function testSingle(it, suffix, test){
   });
 }
 
-
 module.exports = {
   filters,
   findCases,
diff --git a/packages/pug/test/run.test.js b/packages/pug/test/run.test.js
index 83a668ffe..b5c0270fb 100644
--- a/packages/pug/test/run.test.js
+++ b/packages/pug/test/run.test.js
@@ -13,7 +13,7 @@ var es2015 = runUtils.findCases(__dirname + '/cases-es2015');
 
 mkdirp(__dirname + '/output');
 
-describe('test cases', function () {
+describe('test cases', function() {
   cases.forEach((test, i) => {
     runUtils.testSingle(it, '', test);
   });
diff --git a/packages/pug/test/shadowed-block/index.test.js b/packages/pug/test/shadowed-block/index.test.js
index 82f82f416..97999a851 100644
--- a/packages/pug/test/shadowed-block/index.test.js
+++ b/packages/pug/test/shadowed-block/index.test.js
@@ -1,14 +1,10 @@
 const pug = require('../../');
 
 test('layout with shadowed block', () => {
-  const outputWithAjax = pug.renderFile(
-    __dirname + '/index.pug',
-    {ajax: true}
-  );
-  const outputWithoutAjax = pug.renderFile(
-    __dirname + '/index.pug',
-    {ajax: false}
-  );
+  const outputWithAjax = pug.renderFile(__dirname + '/index.pug', {ajax: true});
+  const outputWithoutAjax = pug.renderFile(__dirname + '/index.pug', {
+    ajax: false,
+  });
   expect(outputWithAjax).toMatchSnapshot();
   expect(outputWithoutAjax).toMatchSnapshot();
 });
diff --git a/scripts/filename-serializer.js b/scripts/filename-serializer.js
index fc172ccac..1f78ffd5e 100644
--- a/scripts/filename-serializer.js
+++ b/scripts/filename-serializer.js
@@ -2,7 +2,10 @@ const path = require('path');
 const basedir = path.resolve(__dirname + '/..');
 
 function matchesBasedir(value) {
-  return typeof value === 'string' && value.replace(/\\/g, '/').indexOf(basedir.replace(/\\/g, '/')) === 0
+  return (
+    typeof value === 'string' &&
+    value.replace(/\\/g, '/').indexOf(basedir.replace(/\\/g, '/')) === 0
+  );
 }
 function removeBasedir(value) {
   return '<basedir>' + value.substr(basedir.length).replace(/\\/g, '/');
@@ -11,7 +14,9 @@ function removeBasedir(value) {
 module.exports = {
   test: function(val) {
     return (
-      val && typeof val === 'object' && (matchesBasedir(val.filename) || matchesBasedir(val.message))
+      val &&
+      typeof val === 'object' &&
+      (matchesBasedir(val.filename) || matchesBasedir(val.message))
     );
   },
   print: function(val, serialize, indent) {
@@ -26,5 +31,5 @@ module.exports = {
       output.message = removeBasedir(output.message);
     }
     return serialize(output);
-  }
+  },
 };
diff --git a/scripts/prettier-javascript-serializer.js b/scripts/prettier-javascript-serializer.js
index 0f56b1d1f..bee91b90e 100644
--- a/scripts/prettier-javascript-serializer.js
+++ b/scripts/prettier-javascript-serializer.js
@@ -27,5 +27,5 @@ module.exports = {
   },
   print: function(val, serialize, indent) {
     return serialize(prettier.format(val, prettierOptions));
-  }
+  },
 };
diff --git a/yarn.lock b/yarn.lock
index 774e87e83..d9d942497 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -139,80 +139,6 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@evocateur/libnpmaccess@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
-  integrity sha512-KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg==
-  dependencies:
-    "@evocateur/npm-registry-fetch" "^4.0.0"
-    aproba "^2.0.0"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.0.0"
-    npm-package-arg "^6.1.0"
-
-"@evocateur/libnpmpublish@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz#55df09d2dca136afba9c88c759ca272198db9f1a"
-  integrity sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg==
-  dependencies:
-    "@evocateur/npm-registry-fetch" "^4.0.0"
-    aproba "^2.0.0"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.0.0"
-    lodash.clonedeep "^4.5.0"
-    normalize-package-data "^2.4.0"
-    npm-package-arg "^6.1.0"
-    semver "^5.5.1"
-    ssri "^6.0.1"
-
-"@evocateur/npm-registry-fetch@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz#8c4c38766d8d32d3200fcb0a83f064b57365ed66"
-  integrity sha512-k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g==
-  dependencies:
-    JSONStream "^1.3.4"
-    bluebird "^3.5.1"
-    figgy-pudding "^3.4.1"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^5.0.0"
-    npm-package-arg "^6.1.0"
-    safe-buffer "^5.1.2"
-
-"@evocateur/pacote@^9.6.3":
-  version "9.6.5"
-  resolved "https://registry.npmjs.org/@evocateur/pacote/-/pacote-9.6.5.tgz#33de32ba210b6f17c20ebab4d497efc6755f4ae5"
-  integrity sha512-EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w==
-  dependencies:
-    "@evocateur/npm-registry-fetch" "^4.0.0"
-    bluebird "^3.5.3"
-    cacache "^12.0.3"
-    chownr "^1.1.2"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.1.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^5.0.0"
-    minimatch "^3.0.4"
-    minipass "^2.3.5"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    normalize-package-data "^2.5.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.4.4"
-    npm-pick-manifest "^3.0.0"
-    osenv "^0.1.5"
-    promise-inflight "^1.0.1"
-    promise-retry "^1.1.1"
-    protoduck "^5.0.1"
-    rimraf "^2.6.3"
-    safe-buffer "^5.2.0"
-    semver "^5.7.0"
-    ssri "^6.0.1"
-    tar "^4.4.10"
-    unique-filename "^1.1.1"
-    which "^1.3.1"
-
 "@jest/console@^24.7.1", "@jest/console@^24.9.0":
   version "24.9.0"
   resolved "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
@@ -361,797 +287,6 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@lerna/add@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/add/-/add-3.20.0.tgz#bea7edf36fc93fb72ec34cb9ba854c48d4abf309"
-  integrity sha512-AnH1oRIEEg/VDa3SjYq4x1/UglEAvrZuV0WssHUMN81RTZgQk3we+Mv3qZNddrZ/fBcZu2IAdN/EQ3+ie2JxKQ==
-  dependencies:
-    "@evocateur/pacote" "^9.6.3"
-    "@lerna/bootstrap" "3.20.0"
-    "@lerna/command" "3.18.5"
-    "@lerna/filter-options" "3.20.0"
-    "@lerna/npm-conf" "3.16.0"
-    "@lerna/validation-error" "3.13.0"
-    dedent "^0.7.0"
-    npm-package-arg "^6.1.0"
-    p-map "^2.1.0"
-    semver "^6.2.0"
-
-"@lerna/bootstrap@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.20.0.tgz#635d71046830f208e851ab429a63da1747589e37"
-  integrity sha512-Wylullx3uthKE7r4izo09qeRGL20Y5yONlQEjPCfnbxCC2Elu+QcPu4RC6kqKQ7b+g7pdC3OOgcHZjngrwr5XQ==
-  dependencies:
-    "@lerna/command" "3.18.5"
-    "@lerna/filter-options" "3.20.0"
-    "@lerna/has-npm-version" "3.16.5"
-    "@lerna/npm-install" "3.16.5"
-    "@lerna/package-graph" "3.18.5"
-    "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/rimraf-dir" "3.16.5"
-    "@lerna/run-lifecycle" "3.16.2"
-    "@lerna/run-topologically" "3.18.5"
-    "@lerna/symlink-binary" "3.17.0"
-    "@lerna/symlink-dependencies" "3.17.0"
-    "@lerna/validation-error" "3.13.0"
-    dedent "^0.7.0"
-    get-port "^4.2.0"
-    multimatch "^3.0.0"
-    npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
-    p-finally "^1.0.0"
-    p-map "^2.1.0"
-    p-map-series "^1.0.0"
-    p-waterfall "^1.0.0"
-    read-package-tree "^5.1.6"
-    semver "^6.2.0"
-
-"@lerna/changed@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/changed/-/changed-3.20.0.tgz#66b97ebd6c8f8d207152ee524a0791846a9097ae"
-  integrity sha512-+hzMFSldbRPulZ0vbKk6RD9f36gaH3Osjx34wrrZ62VB4pKmjyuS/rxVYkCA3viPLHoiIw2F8zHM5BdYoDSbjw==
-  dependencies:
-    "@lerna/collect-updates" "3.20.0"
-    "@lerna/command" "3.18.5"
-    "@lerna/listable" "3.18.5"
-    "@lerna/output" "3.13.0"
-
-"@lerna/check-working-tree@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.16.5.tgz#b4f8ae61bb4523561dfb9f8f8d874dd46bb44baa"
-  integrity sha512-xWjVBcuhvB8+UmCSb5tKVLB5OuzSpw96WEhS2uz6hkWVa/Euh1A0/HJwn2cemyK47wUrCQXtczBUiqnq9yX5VQ==
-  dependencies:
-    "@lerna/collect-uncommitted" "3.16.5"
-    "@lerna/describe-ref" "3.16.5"
-    "@lerna/validation-error" "3.13.0"
-
-"@lerna/child-process@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.16.5.tgz#38fa3c18064aa4ac0754ad80114776a7b36a69b2"
-  integrity sha512-vdcI7mzei9ERRV4oO8Y1LHBZ3A5+ampRKg1wq5nutLsUA4mEBN6H7JqjWOMY9xZemv6+kATm2ofjJ3lW5TszQg==
-  dependencies:
-    chalk "^2.3.1"
-    execa "^1.0.0"
-    strong-log-transformer "^2.0.0"
-
-"@lerna/clean@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/clean/-/clean-3.20.0.tgz#ba777e373ddeae63e57860df75d47a9e5264c5b2"
-  integrity sha512-9ZdYrrjQvR5wNXmHfDsfjWjp0foOkCwKe3hrckTzkAeQA1ibyz5llGwz5e1AeFrV12e2/OLajVqYfe+qdkZUgg==
-  dependencies:
-    "@lerna/command" "3.18.5"
-    "@lerna/filter-options" "3.20.0"
-    "@lerna/prompt" "3.18.5"
-    "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/rimraf-dir" "3.16.5"
-    p-map "^2.1.0"
-    p-map-series "^1.0.0"
-    p-waterfall "^1.0.0"
-
-"@lerna/cli@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.5.tgz#c90c461542fcd35b6d5b015a290fb0dbfb41d242"
-  integrity sha512-erkbxkj9jfc89vVs/jBLY/fM0I80oLmJkFUV3Q3wk9J3miYhP14zgVEBsPZY68IZlEjT6T3Xlq2xO1AVaatHsA==
-  dependencies:
-    "@lerna/global-options" "3.13.0"
-    dedent "^0.7.0"
-    npmlog "^4.1.2"
-    yargs "^14.2.2"
-
-"@lerna/collect-uncommitted@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-3.16.5.tgz#a494d61aac31cdc7aec4bbe52c96550274132e63"
-  integrity sha512-ZgqnGwpDZiWyzIQVZtQaj9tRizsL4dUOhuOStWgTAw1EMe47cvAY2kL709DzxFhjr6JpJSjXV5rZEAeU3VE0Hg==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    chalk "^2.3.1"
-    figgy-pudding "^3.5.1"
-    npmlog "^4.1.2"
-
-"@lerna/collect-updates@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.20.0.tgz#62f9d76ba21a25b7d9fbf31c02de88744a564bd1"
-  integrity sha512-qBTVT5g4fupVhBFuY4nI/3FSJtQVcDh7/gEPOpRxoXB/yCSnT38MFHXWl+y4einLciCjt/+0x6/4AG80fjay2Q==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/describe-ref" "3.16.5"
-    minimatch "^3.0.4"
-    npmlog "^4.1.2"
-    slash "^2.0.0"
-
-"@lerna/command@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/command/-/command-3.18.5.tgz#14c6d2454adbfd365f8027201523e6c289cd3cd9"
-  integrity sha512-36EnqR59yaTU4HrR1C9XDFti2jRx0BgpIUBeWn129LZZB8kAB3ov1/dJNa1KcNRKp91DncoKHLY99FZ6zTNpMQ==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/package-graph" "3.18.5"
-    "@lerna/project" "3.18.0"
-    "@lerna/validation-error" "3.13.0"
-    "@lerna/write-log-file" "3.13.0"
-    clone-deep "^4.0.1"
-    dedent "^0.7.0"
-    execa "^1.0.0"
-    is-ci "^2.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/conventional-commits@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.18.5.tgz#08efd2e5b45acfaf3f151a53a3ec7ecade58a7bc"
-  integrity sha512-qcvXIEJ3qSgalxXnQ7Yxp5H9Ta5TVyai6vEor6AAEHc20WiO7UIdbLDCxBtiiHMdGdpH85dTYlsoYUwsCJu3HQ==
-  dependencies:
-    "@lerna/validation-error" "3.13.0"
-    conventional-changelog-angular "^5.0.3"
-    conventional-changelog-core "^3.1.6"
-    conventional-recommended-bump "^5.0.0"
-    fs-extra "^8.1.0"
-    get-stream "^4.0.0"
-    lodash.template "^4.5.0"
-    npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
-    pify "^4.0.1"
-    semver "^6.2.0"
-
-"@lerna/create-symlink@3.16.2":
-  version "3.16.2"
-  resolved "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.16.2.tgz#412cb8e59a72f5a7d9463e4e4721ad2070149967"
-  integrity sha512-pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw==
-  dependencies:
-    "@zkochan/cmd-shim" "^3.1.0"
-    fs-extra "^8.1.0"
-    npmlog "^4.1.2"
-
-"@lerna/create@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/create/-/create-3.18.5.tgz#11ac539f069248eaf7bc4c42e237784330f4fc47"
-  integrity sha512-cHpjocbpKmLopCuZFI7cKEM3E/QY8y+yC7VtZ4FQRSaLU8D8i2xXtXmYaP1GOlVNavji0iwoXjuNpnRMInIr2g==
-  dependencies:
-    "@evocateur/pacote" "^9.6.3"
-    "@lerna/child-process" "3.16.5"
-    "@lerna/command" "3.18.5"
-    "@lerna/npm-conf" "3.16.0"
-    "@lerna/validation-error" "3.13.0"
-    camelcase "^5.0.0"
-    dedent "^0.7.0"
-    fs-extra "^8.1.0"
-    globby "^9.2.0"
-    init-package-json "^1.10.3"
-    npm-package-arg "^6.1.0"
-    p-reduce "^1.0.0"
-    pify "^4.0.1"
-    semver "^6.2.0"
-    slash "^2.0.0"
-    validate-npm-package-license "^3.0.3"
-    validate-npm-package-name "^3.0.0"
-    whatwg-url "^7.0.0"
-
-"@lerna/describe-ref@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.16.5.tgz#a338c25aaed837d3dc70b8a72c447c5c66346ac0"
-  integrity sha512-c01+4gUF0saOOtDBzbLMFOTJDHTKbDFNErEY6q6i9QaXuzy9LNN62z+Hw4acAAZuJQhrVWncVathcmkkjvSVGw==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    npmlog "^4.1.2"
-
-"@lerna/diff@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.5.tgz#e9e2cb882f84d5b84f0487c612137305f07accbc"
-  integrity sha512-u90lGs+B8DRA9Z/2xX4YaS3h9X6GbypmGV6ITzx9+1Ga12UWGTVlKaCXBgONMBjzJDzAQOK8qPTwLA57SeBLgA==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/command" "3.18.5"
-    "@lerna/validation-error" "3.13.0"
-    npmlog "^4.1.2"
-
-"@lerna/exec@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/exec/-/exec-3.20.0.tgz#29f0c01aee2340eb46f90706731fef2062a49639"
-  integrity sha512-pS1mmC7kzV668rHLWuv31ClngqeXjeHC8kJuM+W2D6IpUVMGQHLcCTYLudFgQsuKGVpl0DGNYG+sjLhAPiiu6A==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/command" "3.18.5"
-    "@lerna/filter-options" "3.20.0"
-    "@lerna/profiler" "3.20.0"
-    "@lerna/run-topologically" "3.18.5"
-    "@lerna/validation-error" "3.13.0"
-    p-map "^2.1.0"
-
-"@lerna/filter-options@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.20.0.tgz#0f0f5d5a4783856eece4204708cc902cbc8af59b"
-  integrity sha512-bmcHtvxn7SIl/R9gpiNMVG7yjx7WyT0HSGw34YVZ9B+3xF/83N3r5Rgtjh4hheLZ+Q91Or0Jyu5O3Nr+AwZe2g==
-  dependencies:
-    "@lerna/collect-updates" "3.20.0"
-    "@lerna/filter-packages" "3.18.0"
-    dedent "^0.7.0"
-    figgy-pudding "^3.5.1"
-    npmlog "^4.1.2"
-
-"@lerna/filter-packages@3.18.0":
-  version "3.18.0"
-  resolved "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-3.18.0.tgz#6a7a376d285208db03a82958cfb8172e179b4e70"
-  integrity sha512-6/0pMM04bCHNATIOkouuYmPg6KH3VkPCIgTfQmdkPJTullERyEQfNUKikrefjxo1vHOoCACDpy65JYyKiAbdwQ==
-  dependencies:
-    "@lerna/validation-error" "3.13.0"
-    multimatch "^3.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/get-npm-exec-opts@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz#d1b552cb0088199fc3e7e126f914e39a08df9ea5"
-  integrity sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/get-packed@3.16.0":
-  version "3.16.0"
-  resolved "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-3.16.0.tgz#1b316b706dcee86c7baa55e50b087959447852ff"
-  integrity sha512-AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw==
-  dependencies:
-    fs-extra "^8.1.0"
-    ssri "^6.0.1"
-    tar "^4.4.8"
-
-"@lerna/github-client@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.16.5.tgz#2eb0235c3bf7a7e5d92d73e09b3761ab21f35c2e"
-  integrity sha512-rHQdn8Dv/CJrO3VouOP66zAcJzrHsm+wFuZ4uGAai2At2NkgKH+tpNhQy2H1PSC0Ezj9LxvdaHYrUzULqVK5Hw==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@octokit/plugin-enterprise-rest" "^3.6.1"
-    "@octokit/rest" "^16.28.4"
-    git-url-parse "^11.1.2"
-    npmlog "^4.1.2"
-
-"@lerna/gitlab-client@3.15.0":
-  version "3.15.0"
-  resolved "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz#91f4ec8c697b5ac57f7f25bd50fe659d24aa96a6"
-  integrity sha512-OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q==
-  dependencies:
-    node-fetch "^2.5.0"
-    npmlog "^4.1.2"
-    whatwg-url "^7.0.0"
-
-"@lerna/global-options@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.npmjs.org/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1"
-  integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==
-
-"@lerna/has-npm-version@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.16.5.tgz#ab83956f211d8923ea6afe9b979b38cc73b15326"
-  integrity sha512-WL7LycR9bkftyqbYop5rEGJ9sRFIV55tSGmbN1HLrF9idwOCD7CLrT64t235t3t4O5gehDnwKI5h2U3oxTrF8Q==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    semver "^6.2.0"
-
-"@lerna/import@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/import/-/import-3.18.5.tgz#a9c7d8601870729851293c10abd18b3707f7ba5e"
-  integrity sha512-PH0WVLEgp+ORyNKbGGwUcrueW89K3Iuk/DDCz8mFyG2IG09l/jOF0vzckEyGyz6PO5CMcz4TI1al/qnp3FrahQ==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/command" "3.18.5"
-    "@lerna/prompt" "3.18.5"
-    "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/validation-error" "3.13.0"
-    dedent "^0.7.0"
-    fs-extra "^8.1.0"
-    p-map-series "^1.0.0"
-
-"@lerna/info@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/info/-/info-3.20.0.tgz#3a5212f3029f2bc6255f9533bdf4bcb120ef329a"
-  integrity sha512-Rsz+KQF9mczbGUbPTrtOed1N0C+cA08Qz0eX/oI+NNjvsryZIju/o7uedG4I3P55MBiAioNrJI88fHH3eTgYug==
-  dependencies:
-    "@lerna/command" "3.18.5"
-    "@lerna/output" "3.13.0"
-    envinfo "^7.3.1"
-
-"@lerna/init@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/init/-/init-3.18.5.tgz#86dd0b2b3290755a96975069b5cb007f775df9f5"
-  integrity sha512-oCwipWrha98EcJAHm8AGd2YFFLNI7AW9AWi0/LbClj1+XY9ah+uifXIgYGfTk63LbgophDd8936ZEpHMxBsbAg==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/command" "3.18.5"
-    fs-extra "^8.1.0"
-    p-map "^2.1.0"
-    write-json-file "^3.2.0"
-
-"@lerna/link@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/link/-/link-3.18.5.tgz#f24347e4f0b71d54575bd37cfa1794bc8ee91b18"
-  integrity sha512-xTN3vktJpkT7Nqc3QkZRtHO4bT5NvuLMtKNIBDkks0HpGxC9PRyyqwOoCoh1yOGbrWIuDezhfMg3Qow+6I69IQ==
-  dependencies:
-    "@lerna/command" "3.18.5"
-    "@lerna/package-graph" "3.18.5"
-    "@lerna/symlink-dependencies" "3.17.0"
-    p-map "^2.1.0"
-    slash "^2.0.0"
-
-"@lerna/list@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/list/-/list-3.20.0.tgz#7e67cc29c5cf661cfd097e8a7c2d3dcce7a81029"
-  integrity sha512-fXTicPrfioVnRzknyPawmYIVkzDRBaQqk9spejS1S3O1DOidkihK0xxNkr8HCVC0L22w6f92g83qWDp2BYRUbg==
-  dependencies:
-    "@lerna/command" "3.18.5"
-    "@lerna/filter-options" "3.20.0"
-    "@lerna/listable" "3.18.5"
-    "@lerna/output" "3.13.0"
-
-"@lerna/listable@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.5.tgz#e82798405b5ed8fc51843c8ef1e7a0e497388a1a"
-  integrity sha512-Sdr3pVyaEv5A7ZkGGYR7zN+tTl2iDcinryBPvtuv20VJrXBE8wYcOks1edBTcOWsPjCE/rMP4bo1pseyk3UTsg==
-  dependencies:
-    "@lerna/query-graph" "3.18.5"
-    chalk "^2.3.1"
-    columnify "^1.5.4"
-
-"@lerna/log-packed@3.16.0":
-  version "3.16.0"
-  resolved "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-3.16.0.tgz#f83991041ee77b2495634e14470b42259fd2bc16"
-  integrity sha512-Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ==
-  dependencies:
-    byte-size "^5.0.1"
-    columnify "^1.5.4"
-    has-unicode "^2.0.1"
-    npmlog "^4.1.2"
-
-"@lerna/npm-conf@3.16.0":
-  version "3.16.0"
-  resolved "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.16.0.tgz#1c10a89ae2f6c2ee96962557738685300d376827"
-  integrity sha512-HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA==
-  dependencies:
-    config-chain "^1.1.11"
-    pify "^4.0.1"
-
-"@lerna/npm-dist-tag@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.5.tgz#9ef9abb7c104077b31f6fab22cc73b314d54ac55"
-  integrity sha512-xw0HDoIG6HreVsJND9/dGls1c+lf6vhu7yJoo56Sz5bvncTloYGLUppIfDHQr4ZvmPCK8rsh0euCVh2giPxzKQ==
-  dependencies:
-    "@evocateur/npm-registry-fetch" "^4.0.0"
-    "@lerna/otplease" "3.18.5"
-    figgy-pudding "^3.5.1"
-    npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
-
-"@lerna/npm-install@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.16.5.tgz#d6bfdc16f81285da66515ae47924d6e278d637d3"
-  integrity sha512-hfiKk8Eku6rB9uApqsalHHTHY+mOrrHeWEs+gtg7+meQZMTS3kzv4oVp5cBZigndQr3knTLjwthT/FX4KvseFg==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/get-npm-exec-opts" "3.13.0"
-    fs-extra "^8.1.0"
-    npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
-    signal-exit "^3.0.2"
-    write-pkg "^3.1.0"
-
-"@lerna/npm-publish@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.18.5.tgz#240e4039959fd9816b49c5b07421e11b5cb000af"
-  integrity sha512-3etLT9+2L8JAx5F8uf7qp6iAtOLSMj+ZYWY6oUgozPi/uLqU0/gsMsEXh3F0+YVW33q0M61RpduBoAlOOZnaTg==
-  dependencies:
-    "@evocateur/libnpmpublish" "^1.2.2"
-    "@lerna/otplease" "3.18.5"
-    "@lerna/run-lifecycle" "3.16.2"
-    figgy-pudding "^3.5.1"
-    fs-extra "^8.1.0"
-    npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
-    pify "^4.0.1"
-    read-package-json "^2.0.13"
-
-"@lerna/npm-run-script@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.16.5.tgz#9c2ec82453a26c0b46edc0bb7c15816c821f5c15"
-  integrity sha512-1asRi+LjmVn3pMjEdpqKJZFT/3ZNpb+VVeJMwrJaV/3DivdNg7XlPK9LTrORuKU4PSvhdEZvJmSlxCKyDpiXsQ==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    "@lerna/get-npm-exec-opts" "3.13.0"
-    npmlog "^4.1.2"
-
-"@lerna/otplease@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.18.5.tgz#b77b8e760b40abad9f7658d988f3ea77d4fd0231"
-  integrity sha512-S+SldXAbcXTEDhzdxYLU0ZBKuYyURP/ND2/dK6IpKgLxQYh/z4ScljPDMyKymmEvgiEJmBsPZAAPfmNPEzxjog==
-  dependencies:
-    "@lerna/prompt" "3.18.5"
-    figgy-pudding "^3.5.1"
-
-"@lerna/output@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.npmjs.org/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989"
-  integrity sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/pack-directory@3.16.4":
-  version "3.16.4"
-  resolved "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.4.tgz#3eae5f91bdf5acfe0384510ed53faddc4c074693"
-  integrity sha512-uxSF0HZeGyKaaVHz5FroDY9A5NDDiCibrbYR6+khmrhZtY0Bgn6hWq8Gswl9iIlymA+VzCbshWIMX4o2O8C8ng==
-  dependencies:
-    "@lerna/get-packed" "3.16.0"
-    "@lerna/package" "3.16.0"
-    "@lerna/run-lifecycle" "3.16.2"
-    figgy-pudding "^3.5.1"
-    npm-packlist "^1.4.4"
-    npmlog "^4.1.2"
-    tar "^4.4.10"
-    temp-write "^3.4.0"
-
-"@lerna/package-graph@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.5.tgz#c740e2ea3578d059e551633e950690831b941f6b"
-  integrity sha512-8QDrR9T+dBegjeLr+n9WZTVxUYUhIUjUgZ0gvNxUBN8S1WB9r6H5Yk56/MVaB64tA3oGAN9IIxX6w0WvTfFudA==
-  dependencies:
-    "@lerna/prerelease-id-from-version" "3.16.0"
-    "@lerna/validation-error" "3.13.0"
-    npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
-    semver "^6.2.0"
-
-"@lerna/package@3.16.0":
-  version "3.16.0"
-  resolved "https://registry.npmjs.org/@lerna/package/-/package-3.16.0.tgz#7e0a46e4697ed8b8a9c14d59c7f890e0d38ba13c"
-  integrity sha512-2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw==
-  dependencies:
-    load-json-file "^5.3.0"
-    npm-package-arg "^6.1.0"
-    write-pkg "^3.1.0"
-
-"@lerna/prerelease-id-from-version@3.16.0":
-  version "3.16.0"
-  resolved "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz#b24bfa789f5e1baab914d7b08baae9b7bd7d83a1"
-  integrity sha512-qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA==
-  dependencies:
-    semver "^6.2.0"
-
-"@lerna/profiler@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/profiler/-/profiler-3.20.0.tgz#0f6dc236f4ea8f9ea5f358c6703305a4f32ad051"
-  integrity sha512-bh8hKxAlm6yu8WEOvbLENm42i2v9SsR4WbrCWSbsmOElx3foRnMlYk7NkGECa+U5c3K4C6GeBbwgqs54PP7Ljg==
-  dependencies:
-    figgy-pudding "^3.5.1"
-    fs-extra "^8.1.0"
-    npmlog "^4.1.2"
-    upath "^1.2.0"
-
-"@lerna/project@3.18.0":
-  version "3.18.0"
-  resolved "https://registry.npmjs.org/@lerna/project/-/project-3.18.0.tgz#56feee01daeb42c03cbdf0ed8a2a10cbce32f670"
-  integrity sha512-+LDwvdAp0BurOAWmeHE3uuticsq9hNxBI0+FMHiIai8jrygpJGahaQrBYWpwbshbQyVLeQgx3+YJdW2TbEdFWA==
-  dependencies:
-    "@lerna/package" "3.16.0"
-    "@lerna/validation-error" "3.13.0"
-    cosmiconfig "^5.1.0"
-    dedent "^0.7.0"
-    dot-prop "^4.2.0"
-    glob-parent "^5.0.0"
-    globby "^9.2.0"
-    load-json-file "^5.3.0"
-    npmlog "^4.1.2"
-    p-map "^2.1.0"
-    resolve-from "^4.0.0"
-    write-json-file "^3.2.0"
-
-"@lerna/prompt@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.18.5.tgz#628cd545f225887d060491ab95df899cfc5218a1"
-  integrity sha512-rkKj4nm1twSbBEb69+Em/2jAERK8htUuV8/xSjN0NPC+6UjzAwY52/x9n5cfmpa9lyKf/uItp7chCI7eDmNTKQ==
-  dependencies:
-    inquirer "^6.2.0"
-    npmlog "^4.1.2"
-
-"@lerna/publish@3.20.2":
-  version "3.20.2"
-  resolved "https://registry.npmjs.org/@lerna/publish/-/publish-3.20.2.tgz#a45d29813099b3249657ea913d0dc3f8ebc5cc2e"
-  integrity sha512-N7Y6PdhJ+tYQPdI1tZum8W25cDlTp4D6brvRacKZusweWexxaopbV8RprBaKexkEX/KIbncuADq7qjDBdQHzaA==
-  dependencies:
-    "@evocateur/libnpmaccess" "^3.1.2"
-    "@evocateur/npm-registry-fetch" "^4.0.0"
-    "@evocateur/pacote" "^9.6.3"
-    "@lerna/check-working-tree" "3.16.5"
-    "@lerna/child-process" "3.16.5"
-    "@lerna/collect-updates" "3.20.0"
-    "@lerna/command" "3.18.5"
-    "@lerna/describe-ref" "3.16.5"
-    "@lerna/log-packed" "3.16.0"
-    "@lerna/npm-conf" "3.16.0"
-    "@lerna/npm-dist-tag" "3.18.5"
-    "@lerna/npm-publish" "3.18.5"
-    "@lerna/otplease" "3.18.5"
-    "@lerna/output" "3.13.0"
-    "@lerna/pack-directory" "3.16.4"
-    "@lerna/prerelease-id-from-version" "3.16.0"
-    "@lerna/prompt" "3.18.5"
-    "@lerna/pulse-till-done" "3.13.0"
-    "@lerna/run-lifecycle" "3.16.2"
-    "@lerna/run-topologically" "3.18.5"
-    "@lerna/validation-error" "3.13.0"
-    "@lerna/version" "3.20.2"
-    figgy-pudding "^3.5.1"
-    fs-extra "^8.1.0"
-    npm-package-arg "^6.1.0"
-    npmlog "^4.1.2"
-    p-finally "^1.0.0"
-    p-map "^2.1.0"
-    p-pipe "^1.2.0"
-    semver "^6.2.0"
-
-"@lerna/pulse-till-done@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz#c8e9ce5bafaf10d930a67d7ed0ccb5d958fe0110"
-  integrity sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/query-graph@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.5.tgz#df4830bb5155273003bf35e8dda1c32d0927bd86"
-  integrity sha512-50Lf4uuMpMWvJ306be3oQDHrWV42nai9gbIVByPBYJuVW8dT8O8pA3EzitNYBUdLL9/qEVbrR0ry1HD7EXwtRA==
-  dependencies:
-    "@lerna/package-graph" "3.18.5"
-    figgy-pudding "^3.5.1"
-
-"@lerna/resolve-symlink@3.16.0":
-  version "3.16.0"
-  resolved "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz#37fc7095fabdbcf317c26eb74e0d0bde8efd2386"
-  integrity sha512-Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ==
-  dependencies:
-    fs-extra "^8.1.0"
-    npmlog "^4.1.2"
-    read-cmd-shim "^1.0.1"
-
-"@lerna/rimraf-dir@3.16.5":
-  version "3.16.5"
-  resolved "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.16.5.tgz#04316ab5ffd2909657aaf388ea502cb8c2f20a09"
-  integrity sha512-bQlKmO0pXUsXoF8lOLknhyQjOZsCc0bosQDoX4lujBXSWxHVTg1VxURtWf2lUjz/ACsJVDfvHZbDm8kyBk5okA==
-  dependencies:
-    "@lerna/child-process" "3.16.5"
-    npmlog "^4.1.2"
-    path-exists "^3.0.0"
-    rimraf "^2.6.2"
-
-"@lerna/run-lifecycle@3.16.2":
-  version "3.16.2"
-  resolved "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz#67b288f8ea964db9ea4fb1fbc7715d5bbb0bce00"
-  integrity sha512-RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A==
-  dependencies:
-    "@lerna/npm-conf" "3.16.0"
-    figgy-pudding "^3.5.1"
-    npm-lifecycle "^3.1.2"
-    npmlog "^4.1.2"
-
-"@lerna/run-topologically@3.18.5":
-  version "3.18.5"
-  resolved "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.5.tgz#3cd639da20e967d7672cb88db0f756b92f2fdfc3"
-  integrity sha512-6N1I+6wf4hLOnPW+XDZqwufyIQ6gqoPfHZFkfWlvTQ+Ue7CuF8qIVQ1Eddw5HKQMkxqN10thKOFfq/9NQZ4NUg==
-  dependencies:
-    "@lerna/query-graph" "3.18.5"
-    figgy-pudding "^3.5.1"
-    p-queue "^4.0.0"
-
-"@lerna/run@3.20.0":
-  version "3.20.0"
-  resolved "https://registry.npmjs.org/@lerna/run/-/run-3.20.0.tgz#a479f7c42bdf9ebabb3a1e5a2bdebb7a8d201151"
-  integrity sha512-9U3AqeaCeB7KsGS9oyKNp62s9vYoULg/B4cqXTKZkc+OKL6QOEjYHYVSBcMK9lUXrMjCjDIuDSX3PnTCPxQ2Dw==
-  dependencies:
-    "@lerna/command" "3.18.5"
-    "@lerna/filter-options" "3.20.0"
-    "@lerna/npm-run-script" "3.16.5"
-    "@lerna/output" "3.13.0"
-    "@lerna/profiler" "3.20.0"
-    "@lerna/run-topologically" "3.18.5"
-    "@lerna/timer" "3.13.0"
-    "@lerna/validation-error" "3.13.0"
-    p-map "^2.1.0"
-
-"@lerna/symlink-binary@3.17.0":
-  version "3.17.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.17.0.tgz#8f8031b309863814883d3f009877f82e38aef45a"
-  integrity sha512-RLpy9UY6+3nT5J+5jkM5MZyMmjNHxZIZvXLV+Q3MXrf7Eaa1hNqyynyj4RO95fxbS+EZc4XVSk25DGFQbcRNSQ==
-  dependencies:
-    "@lerna/create-symlink" "3.16.2"
-    "@lerna/package" "3.16.0"
-    fs-extra "^8.1.0"
-    p-map "^2.1.0"
-
-"@lerna/symlink-dependencies@3.17.0":
-  version "3.17.0"
-  resolved "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.17.0.tgz#48d6360e985865a0e56cd8b51b308a526308784a"
-  integrity sha512-KmjU5YT1bpt6coOmdFueTJ7DFJL4H1w5eF8yAQ2zsGNTtZ+i5SGFBWpb9AQaw168dydc3s4eu0W0Sirda+F59Q==
-  dependencies:
-    "@lerna/create-symlink" "3.16.2"
-    "@lerna/resolve-symlink" "3.16.0"
-    "@lerna/symlink-binary" "3.17.0"
-    fs-extra "^8.1.0"
-    p-finally "^1.0.0"
-    p-map "^2.1.0"
-    p-map-series "^1.0.0"
-
-"@lerna/timer@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.npmjs.org/@lerna/timer/-/timer-3.13.0.tgz#bcd0904551db16e08364d6c18e5e2160fc870781"
-  integrity sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw==
-
-"@lerna/validation-error@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-3.13.0.tgz#c86b8f07c5ab9539f775bd8a54976e926f3759c3"
-  integrity sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA==
-  dependencies:
-    npmlog "^4.1.2"
-
-"@lerna/version@3.20.2":
-  version "3.20.2"
-  resolved "https://registry.npmjs.org/@lerna/version/-/version-3.20.2.tgz#3709141c0f537741d9bc10cb24f56897bcb30428"
-  integrity sha512-ckBJMaBWc+xJen0cMyCE7W67QXLLrc0ELvigPIn8p609qkfNM0L0CF803MKxjVOldJAjw84b8ucNWZLvJagP/Q==
-  dependencies:
-    "@lerna/check-working-tree" "3.16.5"
-    "@lerna/child-process" "3.16.5"
-    "@lerna/collect-updates" "3.20.0"
-    "@lerna/command" "3.18.5"
-    "@lerna/conventional-commits" "3.18.5"
-    "@lerna/github-client" "3.16.5"
-    "@lerna/gitlab-client" "3.15.0"
-    "@lerna/output" "3.13.0"
-    "@lerna/prerelease-id-from-version" "3.16.0"
-    "@lerna/prompt" "3.18.5"
-    "@lerna/run-lifecycle" "3.16.2"
-    "@lerna/run-topologically" "3.18.5"
-    "@lerna/validation-error" "3.13.0"
-    chalk "^2.3.1"
-    dedent "^0.7.0"
-    load-json-file "^5.3.0"
-    minimatch "^3.0.4"
-    npmlog "^4.1.2"
-    p-map "^2.1.0"
-    p-pipe "^1.2.0"
-    p-reduce "^1.0.0"
-    p-waterfall "^1.0.0"
-    semver "^6.2.0"
-    slash "^2.0.0"
-    temp-write "^3.4.0"
-    write-json-file "^3.2.0"
-
-"@lerna/write-log-file@3.13.0":
-  version "3.13.0"
-  resolved "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-3.13.0.tgz#b78d9e4cfc1349a8be64d91324c4c8199e822a26"
-  integrity sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==
-  dependencies:
-    npmlog "^4.1.2"
-    write-file-atomic "^2.3.0"
-
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
-  dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
-
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-
-"@octokit/auth-token@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz#b64178975218b99e4dfe948253f0673cbbb59d9f"
-  integrity sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==
-  dependencies:
-    "@octokit/types" "^2.0.0"
-
-"@octokit/endpoint@^5.5.0":
-  version "5.5.3"
-  resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.3.tgz#0397d1baaca687a4c8454ba424a627699d97c978"
-  integrity sha512-EzKwkwcxeegYYah5ukEeAI/gYRLv2Y9U5PpIsseGSFDk+G3RbipQGBs8GuYS1TLCtQaqoO66+aQGtITPalxsNQ==
-  dependencies:
-    "@octokit/types" "^2.0.0"
-    is-plain-object "^3.0.0"
-    universal-user-agent "^5.0.0"
-
-"@octokit/plugin-enterprise-rest@^3.6.1":
-  version "3.6.2"
-  resolved "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz#74de25bef21e0182b4fa03a8678cd00a4e67e561"
-  integrity sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA==
-
-"@octokit/plugin-paginate-rest@^1.1.1":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz#004170acf8c2be535aba26727867d692f7b488fc"
-  integrity sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q==
-  dependencies:
-    "@octokit/types" "^2.0.1"
-
-"@octokit/plugin-request-log@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e"
-  integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==
-
-"@octokit/plugin-rest-endpoint-methods@2.4.0":
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz#3288ecf5481f68c494dd0602fc15407a59faf61e"
-  integrity sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==
-  dependencies:
-    "@octokit/types" "^2.0.1"
-    deprecation "^2.3.1"
-
-"@octokit/request-error@^1.0.1", "@octokit/request-error@^1.0.2":
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz#ede0714c773f32347576c25649dc013ae6b31801"
-  integrity sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==
-  dependencies:
-    "@octokit/types" "^2.0.0"
-    deprecation "^2.0.0"
-    once "^1.4.0"
-
-"@octokit/request@^5.2.0":
-  version "5.3.2"
-  resolved "https://registry.npmjs.org/@octokit/request/-/request-5.3.2.tgz#1ca8b90a407772a1ee1ab758e7e0aced213b9883"
-  integrity sha512-7NPJpg19wVQy1cs2xqXjjRq/RmtSomja/VSWnptfYwuBxLdbYh2UjhGi0Wx7B1v5Iw5GKhfFDQL7jM7SSp7K2g==
-  dependencies:
-    "@octokit/endpoint" "^5.5.0"
-    "@octokit/request-error" "^1.0.1"
-    "@octokit/types" "^2.0.0"
-    deprecation "^2.0.0"
-    is-plain-object "^3.0.0"
-    node-fetch "^2.3.0"
-    once "^1.4.0"
-    universal-user-agent "^5.0.0"
-
-"@octokit/rest@^16.28.4":
-  version "16.43.1"
-  resolved "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz#3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b"
-  integrity sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==
-  dependencies:
-    "@octokit/auth-token" "^2.4.0"
-    "@octokit/plugin-paginate-rest" "^1.1.1"
-    "@octokit/plugin-request-log" "^1.0.0"
-    "@octokit/plugin-rest-endpoint-methods" "2.4.0"
-    "@octokit/request" "^5.2.0"
-    "@octokit/request-error" "^1.0.2"
-    atob-lite "^2.0.0"
-    before-after-hook "^2.0.0"
-    btoa-lite "^1.0.0"
-    deprecation "^2.0.0"
-    lodash.get "^4.4.2"
-    lodash.set "^4.3.2"
-    lodash.uniq "^4.5.0"
-    octokit-pagination-methods "^1.1.0"
-    once "^1.4.0"
-    universal-user-agent "^4.0.0"
-
-"@octokit/types@^2.0.0", "@octokit/types@^2.0.1":
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/@octokit/types/-/types-2.5.0.tgz#f1bbd147e662ae2c79717d518aac686e58257773"
-  integrity sha512-KEnLwOfdXzxPNL34fj508bhi9Z9cStyN7qY1kOfVahmqtAfrWw6Oq3P4R+dtsg0lYtZdWBpUrS/Ixmd5YILSww==
-  dependencies:
-    "@types/node" ">= 8"
-
 "@types/babel__core@^7.1.0":
   version "7.1.6"
   resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610"
@@ -1185,20 +320,6 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
-"@types/glob@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1219,16 +340,6 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/node@*", "@types/node@>= 8":
-  version "13.9.1"
-  resolved "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72"
-  integrity sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==
-
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -1246,33 +357,11 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@zkochan/cmd-shim@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e"
-  integrity sha512-o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg==
-  dependencies:
-    is-windows "^1.0.0"
-    mkdirp-promise "^5.0.1"
-    mz "^2.5.0"
-
-JSONStream@^1.0.4, JSONStream@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 abab@^2.0.0:
   version "2.0.3"
   resolved "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 acorn-globals@^4.1.0:
   version "4.3.4"
   resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -1311,27 +400,6 @@ acorn@~4.0.2:
   resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
   integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
 
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agentkeepalive@^3.4.1:
-  version "3.5.2"
-  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
-  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
-  dependencies:
-    humanize-ms "^1.2.1"
-
 ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
@@ -1364,14 +432,14 @@ amdefine@>=0.0.4:
   resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
@@ -1391,11 +459,6 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1404,24 +467,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-aproba@^1.0.3, aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-aproba@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1444,58 +489,26 @@ arr-union@^3.1.0:
   resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-differ@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1"
-  integrity sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w==
-
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
-array-ify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
-  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
-
-array-union@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asap@^2.0.0, asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-
 asap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
   integrity sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0=
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
@@ -1538,11 +551,6 @@ asynckit@^0.4.0:
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob-lite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
-  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
-
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -1665,11 +673,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-before-after-hook@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
-  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
-
 bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -1684,9 +687,9 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.5.1:
   version "3.7.2"
-  resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 boom@2.x.x:
@@ -1739,52 +742,11 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-btoa-lite@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
-  integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-builtins@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
-
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
-
-byte-size@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/byte-size/-/byte-size-5.0.1.tgz#4b651039a5ecd96767e71a3d7ed380e48bed4191"
-  integrity sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw==
-
-cacache@^12.0.0, cacache@^12.0.3:
-  version "12.0.3"
-  resolved "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
-  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1800,65 +762,19 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase-keys@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
-  dependencies:
-    camelcase "^4.1.0"
-    map-obj "^2.0.0"
-    quick-lru "^1.0.0"
-
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
 camelcase@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 camelcase@^5.0.0, camelcase@^5.3.1:
@@ -1886,7 +802,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1902,16 +818,6 @@ character-parser@^2.2.0:
   dependencies:
     is-regex "^1.0.3"
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chownr@^1.1.1, chownr@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -1934,18 +840,6 @@ clean-css@^4.2.3:
   dependencies:
     source-map "~0.6.0"
 
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  dependencies:
-    restore-cursor "^2.0.0"
-
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -1955,6 +849,15 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -1964,20 +867,6 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
 clone@^2.0.0:
   version "2.1.2"
   resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@@ -1990,7 +879,7 @@ co@^4.6.0:
 
 code-point-at@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 coffee-script@~1.12.7:
@@ -2018,14 +907,6 @@ color-name@1.1.3:
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-columnify@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
-  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
-  dependencies:
-    strip-ansi "^3.0.0"
-    wcwidth "^1.0.0"
-
 combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2033,19 +914,6 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@~2.20.3:
-  version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-compare-func@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
-  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
-  dependencies:
-    array-ify "^1.0.0"
-    dot-prop "^3.0.0"
-
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -2056,7 +924,7 @@ concat-map@0.0.1:
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0:
+concat-stream@^1.4.6, concat-stream@^1.4.7:
   version "1.6.2"
   resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2066,29 +934,6 @@ concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
-  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.0.2"
-    typedarray "^0.0.6"
-
-config-chain@^1.1.11:
-  version "1.1.12"
-  resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
-  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constantinople@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
@@ -2097,89 +942,6 @@ constantinople@^4.0.1:
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.1"
 
-conventional-changelog-angular@^5.0.3:
-  version "5.0.6"
-  resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz#269540c624553aded809c29a3508fdc2b544c059"
-  integrity sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==
-  dependencies:
-    compare-func "^1.3.1"
-    q "^1.5.1"
-
-conventional-changelog-core@^3.1.6:
-  version "3.2.3"
-  resolved "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz#b31410856f431c847086a7dcb4d2ca184a7d88fb"
-  integrity sha512-LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ==
-  dependencies:
-    conventional-changelog-writer "^4.0.6"
-    conventional-commits-parser "^3.0.3"
-    dateformat "^3.0.0"
-    get-pkg-repo "^1.0.0"
-    git-raw-commits "2.0.0"
-    git-remote-origin-url "^2.0.0"
-    git-semver-tags "^2.0.3"
-    lodash "^4.2.1"
-    normalize-package-data "^2.3.5"
-    q "^1.5.1"
-    read-pkg "^3.0.0"
-    read-pkg-up "^3.0.0"
-    through2 "^3.0.0"
-
-conventional-changelog-preset-loader@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz#580fa8ab02cef22c24294d25e52d7ccd247a9a6a"
-  integrity sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ==
-
-conventional-changelog-writer@^4.0.6:
-  version "4.0.11"
-  resolved "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz#9f56d2122d20c96eb48baae0bf1deffaed1edba4"
-  integrity sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw==
-  dependencies:
-    compare-func "^1.3.1"
-    conventional-commits-filter "^2.0.2"
-    dateformat "^3.0.0"
-    handlebars "^4.4.0"
-    json-stringify-safe "^5.0.1"
-    lodash "^4.17.15"
-    meow "^5.0.0"
-    semver "^6.0.0"
-    split "^1.0.0"
-    through2 "^3.0.0"
-
-conventional-commits-filter@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
-  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
-  dependencies:
-    lodash.ismatch "^4.4.0"
-    modify-values "^1.0.0"
-
-conventional-commits-parser@^3.0.3:
-  version "3.0.8"
-  resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz#23310a9bda6c93c874224375e72b09fb275fe710"
-  integrity sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ==
-  dependencies:
-    JSONStream "^1.0.4"
-    is-text-path "^1.0.1"
-    lodash "^4.17.15"
-    meow "^5.0.0"
-    split2 "^2.0.0"
-    through2 "^3.0.0"
-    trim-off-newlines "^1.0.0"
-
-conventional-recommended-bump@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz#5af63903947b6e089e77767601cb592cabb106ba"
-  integrity sha512-RVdt0elRcCxL90IrNP0fYCpq1uGt2MALko0eyeQ+zQuDVWtMGAy9ng6yYn3kax42lCj9+XBxQ8ZN6S9bdKxDhQ==
-  dependencies:
-    concat-stream "^2.0.0"
-    conventional-changelog-preset-loader "^2.1.1"
-    conventional-commits-filter "^2.0.2"
-    conventional-commits-parser "^3.0.3"
-    git-raw-commits "2.0.0"
-    git-semver-tags "^2.0.3"
-    meow "^4.0.0"
-    q "^1.5.1"
-
 convert-source-map@^1.4.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
@@ -2187,18 +949,6 @@ convert-source-map@^1.4.0, convert-source-map@^1.7.0:
   dependencies:
     safe-buffer "~5.1.1"
 
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -2214,16 +964,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
-
 coveralls@3.0.9:
   version "3.0.9"
   resolved "https://registry.npmjs.org/coveralls/-/coveralls-3.0.9.tgz#8cfc5a5525f84884e2948a0bf0f1c0e90aac0420"
@@ -2270,25 +1010,6 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
-
-cyclist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
-
-dargs@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
-  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2305,11 +1026,6 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-dateformat@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
-
 debug@*, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -2317,13 +1033,6 @@ debug@*, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2331,27 +1040,7 @@ debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
-debuglog@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
-
-decamelize-keys@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
-  dependencies:
-    decamelize "^1.1.0"
-    map-obj "^1.0.0"
-
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2361,23 +1050,11 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
-  dependencies:
-    clone "^1.0.2"
-
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -2412,46 +1089,16 @@ delayed-stream@~1.0.0:
   resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-deprecation@^2.0.0, deprecation@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
-  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
-
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
   integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
 
-dezalgo@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
-  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
-  dependencies:
-    asap "^2.0.0"
-    wrappy "1"
-
 diff-sequences@^24.9.0:
   version "24.9.0"
   resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
   integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
 
-dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
-  dependencies:
-    path-type "^3.0.0"
-
 doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
@@ -2464,35 +1111,6 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
-dot-prop@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
-  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
-  dependencies:
-    is-obj "^1.0.0"
-
-dot-prop@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
-  dependencies:
-    is-obj "^1.0.0"
-
-duplexer@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -2506,14 +1124,7 @@ emoji-regex@^7.0.1:
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
-  dependencies:
-    iconv-lite "~0.4.13"
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -2525,21 +1136,6 @@ entities@~1.1.1:
   resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-env-paths@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
-  integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
-
-envinfo@^7.3.1:
-  version "7.5.0"
-  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz#91410bb6db262fb4f1409bd506e9ff57e91023f4"
-  integrity sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ==
-
-err-code@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
-
 errno@^0.1.1:
   version "0.1.7"
   resolved "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -2547,7 +1143,7 @@ errno@^0.1.1:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -2580,18 +1176,6 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -2624,11 +1208,6 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-eventemitter3@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
-  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
-
 exec-sh@^0.3.2:
   version "0.3.4"
   resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
@@ -2697,15 +1276,6 @@ extend@~3.0.0, extend@~3.0.2:
   resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -2735,18 +1305,6 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
-fast-glob@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
-  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -2764,18 +1322,6 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -2791,17 +1337,9 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-find-up@^2.0.0:
+find-up@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
@@ -2813,14 +1351,6 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -2856,40 +1386,6 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -2918,51 +1414,21 @@ function-bind@^1.1.1:
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-genfun@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
-  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
   integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
 
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-pkg-repo@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
-  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
-  dependencies:
-    hosted-git-info "^2.1.4"
-    meow "^3.3.0"
-    normalize-package-data "^2.3.0"
-    parse-github-repo-url "^1.3.0"
-    through2 "^2.0.0"
-
-get-port@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
-  integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
-
 get-repo@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/get-repo/-/get-repo-1.0.0.tgz#b14624bba917b677397d00feed98dd316a21b140"
@@ -2974,12 +1440,7 @@ get-repo@^1.0.0:
     promise "^6.0.1"
     tar "^1.0.3"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -2998,75 +1459,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
-  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
-  dependencies:
-    dargs "^4.0.1"
-    lodash.template "^4.0.2"
-    meow "^4.0.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-
-git-remote-origin-url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
-  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
-  dependencies:
-    gitconfiglocal "^1.0.0"
-    pify "^2.3.0"
-
-git-semver-tags@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.3.tgz#48988a718acf593800f99622a952a77c405bfa34"
-  integrity sha512-tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA==
-  dependencies:
-    meow "^4.0.0"
-    semver "^6.0.0"
-
-git-up@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
-  integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw==
-  dependencies:
-    is-ssh "^1.3.0"
-    parse-url "^5.0.0"
-
-git-url-parse@^11.1.2:
-  version "11.1.2"
-  resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
-  integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
-  dependencies:
-    git-up "^4.0.0"
-
-gitconfiglocal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
-  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
-  dependencies:
-    ini "^1.3.2"
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
-  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
@@ -3079,7 +1471,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.6"
   resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3096,21 +1488,7 @@ globals@^11.1.0:
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   version "4.2.3"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -3120,17 +1498,6 @@ growly@^1.3.0:
   resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.4.0:
-  version "4.7.3"
-  resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
-  integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
@@ -3167,11 +1534,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0, has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -3225,7 +1587,7 @@ hoek@2.x.x:
   resolved "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
   integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
+hosted-git-info@^2.1.4:
   version "2.8.8"
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
@@ -3250,19 +1612,6 @@ http-basic@^1.1.0:
     concat-stream "^1.4.6"
     http-response-object "^1.0.0"
 
-http-cache-semantics@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
 http-response-object@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz#a7c4e75aae82f3bb4904e4f43f615673b4d518c3"
@@ -3286,58 +1635,18 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^2.2.3:
-  version "2.2.4"
-  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
-  dependencies:
-    ms "^2.0.0"
-
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
-ignore@^4.0.3:
-  version "4.0.6"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
-  dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
-
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -3351,23 +1660,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
-
-infer-owner@^1.0.3, infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -3376,48 +1668,10 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-ini@^1.3.2, ini@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-init-package-json@^1.10.3:
-  version "1.10.3"
-  resolved "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
-  integrity sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==
-  dependencies:
-    glob "^7.1.1"
-    npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0"
-    promzard "^0.3.0"
-    read "~1.0.1"
-    read-package-json "1 || 2"
-    semver "2.x || 3.x || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-    validate-npm-package-name "^3.0.0"
-
-inquirer@^6.2.0:
-  version "6.5.2"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
-  dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
+inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 invariant@^2.2.4:
   version "2.2.4"
@@ -3426,10 +1680,10 @@ invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
-ip@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -3504,11 +1758,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
 is-expression@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
@@ -3522,26 +1771,16 @@ is-extendable@^0.1.0, is-extendable@^0.1.1:
   resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
   integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
-is-extendable@^1.0.0, is-extendable@^1.0.1:
+is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
   integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
@@ -3556,20 +1795,6 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -3577,16 +1802,6 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -3594,14 +1809,7 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-plain-object@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
-  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
-  dependencies:
-    isobject "^4.0.0"
-
-is-promise@^2.0.0, is-promise@^2.1.0:
+is-promise@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
@@ -3613,13 +1821,6 @@ is-regex@^1.0.3, is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
-is-ssh@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
-  integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==
-  dependencies:
-    protocols "^1.1.0"
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -3632,24 +1833,12 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
-is-text-path@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
-  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
-  dependencies:
-    text-extensions "^1.0.0"
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-windows@^1.0.0, is-windows@^1.0.2:
+is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -3681,11 +1870,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isobject@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
-  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -4150,7 +2334,7 @@ jsesc@^2.5.1:
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
+json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
@@ -4172,7 +2356,7 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
@@ -4184,23 +2368,11 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.5"
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -4233,7 +2405,7 @@ jstransformer-less@^2.1.0, jstransformer-less@^2.3.0:
     less-plugin-inline-urls "^1.1.0"
     less-plugin-npm-import "^2.0.0"
 
-jstransformer-markdown-it@2.0.0, jstransformer-markdown-it@^2.0.0:
+jstransformer-markdown-it@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/jstransformer-markdown-it/-/jstransformer-markdown-it-2.0.0.tgz#8b44aedbc9465dc935d280be90339b671c16ceb8"
   integrity sha1-i0Su28lGXck10oC+kDObZxwWzrg=
@@ -4302,6 +2474,13 @@ lazy-cache@^1.0.3:
   resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
   integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
 lcov-parse@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
@@ -4312,30 +2491,6 @@ left-pad@^1.3.0:
   resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
   integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
 
-lerna@3.20.2:
-  version "3.20.2"
-  resolved "https://registry.npmjs.org/lerna/-/lerna-3.20.2.tgz#abf84e73055fe84ee21b46e64baf37b496c24864"
-  integrity sha512-bjdL7hPLpU3Y8CBnw/1ys3ynQMUjiK6l9iDWnEGwFtDy48Xh5JboR9ZJwmKGCz9A/sarVVIGwf1tlRNKUG9etA==
-  dependencies:
-    "@lerna/add" "3.20.0"
-    "@lerna/bootstrap" "3.20.0"
-    "@lerna/changed" "3.20.0"
-    "@lerna/clean" "3.20.0"
-    "@lerna/cli" "3.18.5"
-    "@lerna/create" "3.18.5"
-    "@lerna/diff" "3.18.5"
-    "@lerna/exec" "3.20.0"
-    "@lerna/import" "3.18.5"
-    "@lerna/info" "3.20.0"
-    "@lerna/init" "3.18.5"
-    "@lerna/link" "3.18.5"
-    "@lerna/list" "3.20.0"
-    "@lerna/publish" "3.20.2"
-    "@lerna/run" "3.20.0"
-    "@lerna/version" "3.20.2"
-    import-local "^2.0.0"
-    npmlog "^4.1.2"
-
 less-plugin-inline-urls@^1.1.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/less-plugin-inline-urls/-/less-plugin-inline-urls-1.2.0.tgz#5ddab07a0c2571f1a2855cf929ddc9efc1e38acc"
@@ -4388,17 +2543,6 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -4409,20 +2553,9 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz#4d3c1e01fa1c03ea78a60ac7af932c9ce53403f3"
-  integrity sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==
-  dependencies:
-    graceful-fs "^4.1.15"
-    parse-json "^4.0.0"
-    pify "^4.0.1"
-    strip-bom "^3.0.0"
-    type-fest "^0.3.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
   integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
@@ -4436,62 +2569,17 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
 lodash.clone@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
   integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
-lodash.ismatch@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
-  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
-
-lodash.set@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
-  integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.template@^4.0.2, lodash.template@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-
-lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1:
+lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4:
   version "4.17.15"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -4513,33 +2601,6 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-macos-release@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f"
-  integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==
-
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
 make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -4548,23 +2609,6 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-fetch-happen@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
-  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
-  dependencies:
-    agentkeepalive "^3.4.1"
-    cacache "^12.0.0"
-    http-cache-semantics "^3.8.1"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    node-fetch-npm "^2.0.2"
-    promise-retry "^1.1.1"
-    socks-proxy-agent "^4.0.0"
-    ssri "^6.0.0"
-
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -4572,21 +2616,18 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
-map-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -4610,62 +2651,20 @@ mdurl@^1.0.1:
   resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
-meow@^3.3.0:
-  version "3.7.0"
-  resolved "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
-meow@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
-  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
-  dependencies:
-    camelcase-keys "^4.0.0"
-    decamelize-keys "^1.0.0"
-    loud-rejection "^1.0.0"
-    minimist "^1.1.3"
-    minimist-options "^3.0.1"
-    normalize-package-data "^2.3.4"
-    read-pkg-up "^3.0.0"
-    redent "^2.0.0"
-    trim-newlines "^2.0.0"
-
-meow@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
-  integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
-  dependencies:
-    camelcase-keys "^4.0.0"
-    decamelize-keys "^1.0.0"
-    loud-rejection "^1.0.0"
-    minimist-options "^3.0.1"
-    normalize-package-data "^2.3.4"
-    read-pkg-up "^3.0.0"
-    redent "^2.0.0"
-    trim-newlines "^2.0.0"
-    yargs-parser "^10.0.0"
+mem@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
 
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
-  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
-
 merge@^1.2.0:
   version "1.2.1"
   resolved "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
@@ -4707,10 +2706,10 @@ mime@^1.2.11:
   resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+mimic-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
@@ -4719,60 +2718,16 @@ minimatch@^3.0.2, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
-  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
-  dependencies:
-    arrify "^1.0.1"
-    is-plain-obj "^1.1.0"
-
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
-minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -4781,84 +2736,23 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mixin-object@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/mixin-object/-/mixin-object-3.0.0.tgz#55091196c9cf744f4c7956fb7021da38c736c440"
-  integrity sha512-RsUqTd3DyF9+UPqhLzJIWwGm4ZGIPYOu6WcQhQuBqqVBGhc6LOC8LrFk9KD7PvVwmqri45IJT88WLrNNrMWjxg==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.0"
-
-mkdirp-promise@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
-  integrity sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE=
-  dependencies:
-    mkdirp "*"
-
-mkdirp@*, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
-modify-values@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
-  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0, ms@^2.1.1:
+ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-multimatch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b"
-  integrity sha512-22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA==
-  dependencies:
-    array-differ "^2.0.3"
-    array-union "^1.0.2"
-    arrify "^1.0.1"
-    minimatch "^3.0.4"
-
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-
-mute-stream@~0.0.4:
-  version "0.0.8"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-mz@^2.5.0:
-  version "2.7.0"
-  resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
 nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -4886,47 +2780,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-neo-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-fetch-npm@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.3.tgz#efae4aacb0500444e449a51fc1467397775ebc38"
-  integrity sha512-DgwoKEsqLnFZtk3ap7GWBHcHwnUhsNmQqEDcdjfQ8GofLEFJ081NAd4Uin3R7RFZBWVJCwHISw1oaEqPgSLloA==
-  dependencies:
-    encoding "^0.1.11"
-    json-parse-better-errors "^1.0.0"
-    safe-buffer "^5.1.1"
-
-node-fetch@^2.3.0, node-fetch@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-
-node-gyp@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.0.tgz#8e31260a7af4a2e2f994b0673d4e0b3866156332"
-  integrity sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.2"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.1.2"
-    request "^2.88.0"
-    rimraf "^2.6.3"
-    semver "^5.7.1"
-    tar "^4.4.12"
-    which "^1.3.1"
-
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -4948,15 +2806,7 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -4973,65 +2823,6 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-url@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
-  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
-
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-lifecycle@^3.1.2:
-  version "3.1.4"
-  resolved "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz#de6975c7d8df65f5150db110b57cce498b0b604c"
-  integrity sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==
-  dependencies:
-    byline "^5.0.0"
-    graceful-fs "^4.1.15"
-    node-gyp "^5.0.2"
-    resolve-from "^4.0.0"
-    slide "^1.1.6"
-    uid-number "0.0.6"
-    umask "^1.1.0"
-    which "^1.3.1"
-
-npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
-  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
-  dependencies:
-    hosted-git-info "^2.7.1"
-    osenv "^0.1.5"
-    semver "^5.6.0"
-    validate-npm-package-name "^3.0.0"
-
-npm-packlist@^1.4.4:
-  version "1.4.8"
-  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
-npm-pick-manifest@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
-  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
-  dependencies:
-    figgy-pudding "^3.5.1"
-    npm-package-arg "^6.0.0"
-    semver "^5.4.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -5039,19 +2830,9 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 nwsapi@^2.0.7:
@@ -5069,7 +2850,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5110,7 +2891,7 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
+object.getownpropertydescriptors@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
   integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
@@ -5125,11 +2906,6 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-octokit-pagination-methods@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
-  integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
-
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -5137,21 +2913,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  dependencies:
-    mimic-fn "^1.0.0"
-
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -5164,31 +2925,19 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-name@^3.1.0:
+os-locale@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
-  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
   dependencies:
-    macos-release "^2.2.0"
-    windows-release "^3.1.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
 
-osenv@^0.1.4, osenv@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-each-series@^1.0.0:
   version "1.0.0"
@@ -5202,9 +2951,14 @@ p-finally@^1.0.0:
   resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
 p-limit@^1.1.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
@@ -5218,7 +2972,7 @@ p-limit@^2.0.0:
 
 p-locate@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
@@ -5230,30 +2984,6 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-map-series@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
-  integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=
-  dependencies:
-    p-reduce "^1.0.0"
-
-p-map@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
-p-pipe@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
-  integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
-
-p-queue@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346"
-  integrity sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==
-  dependencies:
-    eventemitter3 "^3.1.0"
-
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
@@ -5261,7 +2991,7 @@ p-reduce@^1.0.0:
 
 p-try@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
@@ -5269,34 +2999,6 @@ p-try@^2.0.0:
   resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-p-waterfall@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00"
-  integrity sha1-ftlLPOszMngjU69qrhGqn8I1uwA=
-  dependencies:
-    p-reduce "^1.0.0"
-
-parallel-transform@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
-  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
-  dependencies:
-    cyclist "^1.0.1"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-parse-github-repo-url@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
-  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -5305,24 +3007,6 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-path@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"
-  integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA==
-  dependencies:
-    is-ssh "^1.3.0"
-    protocols "^1.4.0"
-
-parse-url@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
-  integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg==
-  dependencies:
-    is-ssh "^1.3.0"
-    normalize-url "^3.3.0"
-    parse-path "^4.0.0"
-    protocols "^1.4.0"
-
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -5333,18 +3017,6 @@ pascalcase@^0.1.1:
   resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -5365,15 +3037,6 @@ path-parse@^1.0.6:
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -5391,11 +3054,6 @@ performance-now@^2.1.0:
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pify@^2.0.0, pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -5406,18 +3064,6 @@ pify@^4.0.1:
   resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
 pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
@@ -5467,19 +3113,6 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise-retry@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
-  dependencies:
-    err-code "^1.0.0"
-    retry "^0.10.0"
-
 promise@^6.0.0, promise@^6.0.1:
   version "6.1.0"
   resolved "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
@@ -5501,37 +3134,13 @@ promise@~7.0.1:
   dependencies:
     asap "~2.0.3"
 
-prompts@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05"
-  integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.4"
-
-promzard@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
-  integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4=
-  dependencies:
-    read "1"
-
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
-protocols@^1.1.0, protocols@^1.4.0:
-  version "1.4.7"
-  resolved "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32"
-  integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==
-
-protoduck@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
-  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
+prompts@^2.0.1:
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05"
+  integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==
   dependencies:
-    genfun "^5.0.0"
+    kleur "^3.0.3"
+    sisteransi "^1.0.4"
 
 prr@~1.0.1:
   version "1.0.1"
@@ -5543,14 +3152,6 @@ psl@^1.1.28:
   resolved "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
   integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
 
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -5559,15 +3160,6 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -5578,11 +3170,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-q@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
 qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
@@ -5593,60 +3180,11 @@ qs@~6.5.2:
   resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-quick-lru@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
-
 react-is@^16.8.4:
   version "16.13.0"
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
   integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
 
-read-cmd-shim@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
-  integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==
-  dependencies:
-    graceful-fs "^4.1.2"
-
-"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1"
-  integrity sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==
-  dependencies:
-    glob "^7.1.1"
-    json-parse-better-errors "^1.0.1"
-    normalize-package-data "^2.0.0"
-    npm-normalize-package-bin "^1.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.2"
-
-read-package-tree@^5.1.6:
-  version "5.3.1"
-  resolved "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
-  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
-  dependencies:
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-    util-promisify "^2.1.0"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg-up@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
@@ -5655,15 +3193,6 @@ read-pkg-up@^4.0.0:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -5673,14 +3202,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read@1, read@~1.0.1:
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
-  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
-  dependencies:
-    mute-stream "~0.0.4"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
+readable-stream@^2.2.2:
   version "2.3.7"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -5693,25 +3215,6 @@ read@1, read@~1.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@2 || 3", readable-stream@^3.0.2:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdir-scoped-modules@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
-  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    graceful-fs "^4.1.2"
-    once "^1.3.0"
-
 realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
@@ -5719,22 +3222,6 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
-redent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
-  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
-  dependencies:
-    indent-string "^3.0.0"
-    strip-indent "^2.0.0"
-
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -5763,13 +3250,6 @@ repeat-string@^1.5.2, repeat-string@^1.6.1:
   resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
 request-promise-core@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
@@ -5845,6 +3325,11 @@ require-directory@^2.1.1:
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -5862,11 +3347,6 @@ resolve-from@^3.0.0:
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
   integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -5884,24 +3364,11 @@ resolve@^1.10.0, resolve@^1.15.1, resolve@^1.3.2:
   dependencies:
     path-parse "^1.0.6"
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
-
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -5909,7 +3376,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3:
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -5928,28 +3395,7 @@ rsvp@^4.8.4:
   resolved "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
-run-async@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
-  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
-  dependencies:
-    is-promise "^2.1.0"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
-rxjs@^6.4.0:
-  version "6.5.4"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.2:
   version "5.2.0"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
@@ -5996,7 +3442,7 @@ sax@^1.2.4:
   resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -6006,7 +3452,7 @@ semver@^6.0.0, semver@^6.2.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -6021,15 +3467,6 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-shallow-clone@2.0.0, shallow-clone@^3.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-2.0.0.tgz#5d0f491e313686b2f53660b8859ca33684f18d20"
-  integrity sha512-M0ikAzIEgiQqFG8gkkuM+sOiVVNSza7VjcvP+WfB8HvYccIFDKt0YIwlx0bbLsD4eiya8ARd0rznCbES9fXMqA==
-  dependencies:
-    is-extendable "^1.0.1"
-    kind-of "^6.0.0"
-    mixin-object "^3.0.0"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -6062,16 +3499,6 @@ slash@^2.0.0:
   resolved "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-slide@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
-
-smart-buffer@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
-  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -6109,29 +3536,6 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-socks-proxy-agent@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
-  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
-  dependencies:
-    agent-base "~4.2.1"
-    socks "~2.3.2"
-
-socks@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
-  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
-  dependencies:
-    ip "1.1.5"
-    smart-buffer "^4.1.0"
-
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -6206,16 +3610,9 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-split2@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
-  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
-  dependencies:
-    through2 "^2.0.2"
-
-split@^1.0.0:
+split@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
   integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
@@ -6240,13 +3637,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
 stack-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
@@ -6265,19 +3655,6 @@ stealthy-require@^1.1.1:
   resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
@@ -6288,16 +3665,16 @@ string-length@^2.0.0:
 
 string-width@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0:
+string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
@@ -6328,13 +3705,6 @@ string.prototype.trimright@^2.1.1:
     define-properties "^1.1.3"
     function-bind "^1.1.1"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -6349,7 +3719,7 @@ stringstream@~0.0.4:
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
@@ -6368,13 +3738,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -6385,28 +3748,7 @@ strip-eof@^1.0.0:
   resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
-  dependencies:
-    get-stdin "^4.0.1"
-
-strip-indent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
-
-strong-log-transformer@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
-  integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
-  dependencies:
-    duplexer "^0.1.1"
-    minimist "^1.2.0"
-    through "^2.3.4"
-
-stylus@0.54.5, stylus@~0.54.5:
+stylus@~0.54.5:
   version "0.54.5"
   resolved "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
   integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
@@ -6446,36 +3788,6 @@ tar@^1.0.3:
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
-  version "4.4.13"
-  resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
-  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
-
-temp-write@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.npmjs.org/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
-  integrity sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI=
-  dependencies:
-    graceful-fs "^4.1.2"
-    is-stream "^1.1.0"
-    make-dir "^1.0.0"
-    pify "^3.0.0"
-    temp-dir "^1.0.0"
-    uuid "^3.0.1"
-
 test-exclude@^5.2.3:
   version "5.2.3"
   resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
@@ -6486,57 +3798,16 @@ test-exclude@^5.2.3:
     read-pkg-up "^4.0.0"
     require-main-filename "^2.0.0"
 
-text-extensions@^1.0.0:
-  version "1.9.0"
-  resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
-  integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
-
-thenify-all@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
-  integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
-  dependencies:
-    any-promise "^1.0.0"
-
-throat@^4.0.0:
+throat@^4.0.0, throat@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
-through2@^2.0.0, through2@^2.0.2:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through2@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
-  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
-  dependencies:
-    readable-stream "2 || 3"
-
-through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6:
+through@2:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -6604,26 +3875,6 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-trim-newlines@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
-  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
-
-trim-off-newlines@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
-  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
-
-tslib@^1.9.0:
-  version "1.11.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
-  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -6643,11 +3894,6 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-fest@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -6668,14 +3914,6 @@ uglify-js@^2.6.1, uglify-js@^2.8.10:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@^3.1.4:
-  version "3.8.0"
-  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805"
-  integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==
-  dependencies:
-    commander "~2.20.3"
-    source-map "~0.6.1"
-
 "uglify-js@github:mishoo/UglifyJS2#1c15d0db456ce32f1b9b507aad97e5ee5c8285f7":
   version "2.7.3"
   resolved "https://codeload.github.com/mishoo/UglifyJS2/tar.gz/1c15d0db456ce32f1b9b507aad97e5ee5c8285f7"
@@ -6690,16 +3928,6 @@ uglify-to-browserify@~1.0.0:
   resolved "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
   integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
-uid-number@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-  integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=
-
-umask@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
-  integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
-
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -6710,39 +3938,6 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-universal-user-agent@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz#fd8d6cb773a679a709e967ef8288a31fcc03e557"
-  integrity sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==
-  dependencies:
-    os-name "^3.1.0"
-
-universal-user-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz#a3182aa758069bf0e79952570ca757de3579c1d9"
-  integrity sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==
-  dependencies:
-    os-name "^3.1.0"
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -6751,11 +3946,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-upath@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -6773,18 +3963,11 @@ use@^3.1.0:
   resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util-promisify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
-  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-
 util.promisify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
@@ -6795,12 +3978,12 @@ util.promisify@^1.0.0:
     has-symbols "^1.0.1"
     object.getownpropertydescriptors "^2.1.0"
 
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2:
+uuid@^3.0.0, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
+validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -6808,13 +3991,6 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
-  dependencies:
-    builtins "^1.0.3"
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -6843,13 +4019,6 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-wcwidth@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
-  dependencies:
-    defaults "^1.0.3"
-
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -6890,32 +4059,18 @@ which-module@^2.0.0:
   resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
   integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
-windows-release@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
-  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
-  dependencies:
-    execa "^1.0.0"
-
 with@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/with/-/with-6.0.0.tgz#00223660fa0d0aeb4776965e61f902410c4c9d86"
@@ -6936,10 +4091,13 @@ wordwrap@0.0.2:
   resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
 
 wrap-ansi@^5.1.0:
   version "5.1.0"
@@ -6964,47 +4122,6 @@ write-file-atomic@2.4.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2:
-  version "2.4.3"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
-write-json-file@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
-  integrity sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=
-  dependencies:
-    detect-indent "^5.0.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    pify "^3.0.0"
-    sort-keys "^2.0.0"
-    write-file-atomic "^2.0.0"
-
-write-json-file@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
-  integrity sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ==
-  dependencies:
-    detect-indent "^5.0.0"
-    graceful-fs "^4.1.15"
-    make-dir "^2.1.0"
-    pify "^4.0.1"
-    sort-keys "^2.0.0"
-    write-file-atomic "^2.4.2"
-
-write-pkg@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz#0e178fe97820d389a8928bc79535dbe68c2cff21"
-  integrity sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==
-  dependencies:
-    sort-keys "^2.0.0"
-    write-json-file "^2.2.0"
-
 ws@^5.2.0:
   version "5.2.2"
   resolved "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
@@ -7012,33 +4129,36 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
+wsrun@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/wsrun/-/wsrun-5.2.0.tgz#a7c0587cb371ea29352f0b3cad002ea839a25b0f"
+  integrity sha512-48j1AltgQxEy3dwDrqWJTZIYSNYPGHtkZzTDjQiHPICXv2qtXPXFj+XutE4aZlCCWKZW+Lc+v6dUjBdH3yg8PQ==
+  dependencies:
+    bluebird "^3.5.1"
+    chalk "^2.3.0"
+    glob "^7.1.2"
+    jest-changed-files "^24.9.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    split "^1.0.1"
+    throat "^4.1.0"
+    yargs "^11.1.1"
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
-xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yargs-parser@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -7047,37 +4167,37 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^15.0.1:
-  version "15.0.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
-  integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
   dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+    camelcase "^4.1.0"
 
-yargs@^13.3.0:
-  version "13.3.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+yargs@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.1.tgz#5052efe3446a4df5ed669c995886cc0f13702766"
+  integrity sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==
   dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
+    require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
-    string-width "^3.0.0"
+    string-width "^2.0.0"
     which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
 
-yargs@^14.2.2:
-  version "14.2.3"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414"
-  integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==
+yargs@^13.3.0:
+  version "13.3.2"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
   dependencies:
     cliui "^5.0.0"
-    decamelize "^1.2.0"
     find-up "^3.0.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"
@@ -7086,7 +4206,7 @@ yargs@^14.2.2:
     string-width "^3.0.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^15.0.1"
+    yargs-parser "^13.1.2"
 
 yargs@~3.10.0:
   version "3.10.0"

From beb375531cbf45e2bc40a0e592cd3250d85e2f0b Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Fri, 1 May 2020 22:10:46 +0100
Subject: [PATCH 83/96] feat: improve error message for malformed each (#3185)

It now includes a description of what `each` should look like. We guide people towards the newer `each ... of ...` syntax, rather than the older `each ... in ...` syntax.
---
 packages/pug-lexer/index.js                          | 12 +++++++++++-
 .../pug-lexer/test/__snapshots__/index.test.js.snap  |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/pug-lexer/index.js b/packages/pug-lexer/index.js
index 671e96408..07afac50e 100644
--- a/packages/pug-lexer/index.js
+++ b/packages/pug-lexer/index.js
@@ -1051,8 +1051,18 @@ Lexer.prototype = {
       this.tokens.push(this.tokEnd(tok));
       return true;
     }
+    const name = /^each\b/.exec(this.input) ? 'each' : 'for';
     if (this.scan(/^(?:each|for)\b/)) {
-      this.error('MALFORMED_EACH', 'malformed each');
+      this.error(
+        'MALFORMED_EACH',
+        'This `' +
+          name +
+          '` has a syntax error. `' +
+          name +
+          '` statements should be of the form: `' +
+          name +
+          ' VARIABLE_NAME of JS_EXPRESSION`'
+      );
     }
     if (
       (captures = /^- *(?:each|for) +([a-zA-Z_$][\w$]*)(?: *, *([a-zA-Z_$][\w$]*))? +in +([^\n]+)/.exec(
diff --git a/packages/pug-lexer/test/__snapshots__/index.test.js.snap b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
index a6457e527..caea3836a 100644
--- a/packages/pug-lexer/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-lexer/test/__snapshots__/index.test.js.snap
@@ -28680,7 +28680,7 @@ Object {
   "code": "PUG:MALFORMED_EACH",
   "column": 5,
   "line": 1,
-  "msg": "malformed each",
+  "msg": "This \`each\` has a syntax error. \`each\` statements should be of the form: \`each VARIABLE_NAME of JS_EXPRESSION\`",
 }
 `;
 

From a941dec45fcf7c97f2de28f8490f512fcb5f25be Mon Sep 17 00:00:00 2001
From: Damian Krzeminski <pirxpilot@furkot.com>
Date: Fri, 1 May 2020 23:26:45 +0200
Subject: [PATCH 84/96] suport minify option in filter using jstransformer
 (#3084)

---
 packages/pug-filters/lib/run-filter.js | 28 +++++++++++++++-----------
 packages/pug-filters/package.json      |  4 +---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/pug-filters/lib/run-filter.js b/packages/pug-filters/lib/run-filter.js
index 5c58b484c..f80bd0c0b 100644
--- a/packages/pug-filters/lib/run-filter.js
+++ b/packages/pug-filters/lib/run-filter.js
@@ -1,11 +1,19 @@
 'use strict';
 
 var jstransformer = require('jstransformer');
-var uglify = require('uglify-js');
-var CleanCSS = require('clean-css');
 var resolve = require('resolve');
 
 module.exports = filter;
+
+function getMinifyTransformerName(outputFormat) {
+  switch (outputFormat) {
+    case 'js':
+      return 'uglify-js';
+    case 'css':
+      return 'clean-css';
+  }
+}
+
 function filter(name, str, options, currentDirectory, funcName) {
   funcName = funcName || 'render';
   var trPath;
@@ -26,17 +34,13 @@ function filter(name, str, options, currentDirectory, funcName) {
   // TODO: we may want to add a way for people to separately specify "locals"
   var result = tr[funcName](str, options, options).body;
   if (options && options.minify) {
-    try {
-      switch (tr.outputFormat) {
-        case 'js':
-          result = uglify.minify(result, {fromString: true}).code;
-          break;
-        case 'css':
-          result = new CleanCSS().minify(result).styles;
-          break;
+    var minifyTranformer = getMinifyTransformerName(tr.outputFormat);
+    if (minifyTranformer) {
+      try {
+        result = filter(minifyTranformer, result, null, currentDirectory);
+      } catch (ex) {
+        // better to fail to minify than output nothing
       }
-    } catch (ex) {
-      // better to fail to minify than output nothing
     }
   }
   return result;
diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index f0166f4d5..3d5dea9e5 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -6,13 +6,11 @@
     "pug"
   ],
   "dependencies": {
-    "clean-css": "^4.2.3",
     "constantinople": "^4.0.1",
     "jstransformer": "1.0.0",
     "pug-error": "^1.3.3",
     "pug-walk": "^1.1.8",
-    "resolve": "^1.15.1",
-    "uglify-js": "^2.6.1"
+    "resolve": "^1.15.1"
   },
   "devDependencies": {
     "get-repo": "^1.0.0",

From 377703bac8314fe8f976cb2139229a42820d27d9 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Fri, 1 May 2020 23:01:05 +0100
Subject: [PATCH 85/96] blank commit to attach missing change logs (#3244)


From 854fd2f537d060c653dfde3d652ab4350474f90d Mon Sep 17 00:00:00 2001
From: zackschuster <email@zackschuster.com>
Date: Fri, 1 May 2020 18:40:44 -0700
Subject: [PATCH 86/96] chore: update lockfile (#3246)

---
 yarn.lock | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d9d942497..a1b497321 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -833,13 +833,6 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
-  dependencies:
-    source-map "~0.6.0"
-
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -3572,7 +3565,7 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

From bb0731f75813aa30d8e077808b5465a67ef284ef Mon Sep 17 00:00:00 2001
From: zackschuster <email@zackschuster.com>
Date: Fri, 1 May 2020 18:41:56 -0700
Subject: [PATCH 87/96] chore: use minimal settings to format test files
 (#3245)

---
 .../pug/test/__snapshots__/pug.test.js.snap   | 40 +++++++++----------
 scripts/prettier-javascript-serializer.js     | 12 +-----
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/packages/pug/test/__snapshots__/pug.test.js.snap b/packages/pug/test/__snapshots__/pug.test.js.snap
index 622f468a2..dd3ef1968 100644
--- a/packages/pug/test/__snapshots__/pug.test.js.snap
+++ b/packages/pug/test/__snapshots__/pug.test.js.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it false 1`] = `
-"var pug = require('pug-runtime');
+"var pug = require(\\"pug-runtime\\");
 function template(locals) {
-  var pug_html = '',
+  var pug_html = \\"\\",
     pug_mixins = {},
     pug_interp;
   var pug_debug_filename, pug_debug_line;
@@ -14,8 +14,8 @@ function template(locals) {
     pug_debug_line = 1;
     pug_html =
       pug_html +
-      pug.escape(null == (pug_interp = self.foo) ? '' : pug_interp) +
-      '\\\\u003C\\\\u002Fdiv\\\\u003E';
+      pug.escape(null == (pug_interp = self.foo) ? \\"\\" : pug_interp) +
+      \\"\\\\u003C\\\\u002Fdiv\\\\u003E\\";
   } catch (err) {
     pug.rethrow(err, pug_debug_filename, pug_debug_line);
   }
@@ -27,26 +27,26 @@ module.exports = template;
 
 exports[`pug .compileClient() should support module syntax in pug.compileClient(str, options) when inlineRuntimeFunctions it true 1`] = `
 "function pug_escape(e) {
-  var a = '' + e,
+  var a = \\"\\" + e,
     t = pug_match_html.exec(a);
   if (!t) return e;
   var r,
     c,
     n,
-    s = '';
+    s = \\"\\";
   for (r = t.index, c = 0; r < a.length; r++) {
     switch (a.charCodeAt(r)) {
       case 34:
-        n = '&quot;';
+        n = \\"&quot;\\";
         break;
       case 38:
-        n = '&amp;';
+        n = \\"&amp;\\";
         break;
       case 60:
-        n = '&lt;';
+        n = \\"&lt;\\";
         break;
       case 62:
-        n = '&gt;';
+        n = \\"&gt;\\";
         break;
       default:
         continue;
@@ -58,32 +58,32 @@ exports[`pug .compileClient() should support module syntax in pug.compileClient(
 var pug_match_html = /[\\"&<>]/;
 function pug_rethrow(n, e, t, r) {
   if (!(n instanceof Error)) throw n;
-  if (!(('undefined' == typeof window && e) || r))
-    throw ((n.message += ' on line ' + t), n);
+  if (!((\\"undefined\\" == typeof window && e) || r))
+    throw ((n.message += \\" on line \\" + t), n);
   try {
-    r = r || require('fs').readFileSync(e, 'utf8');
+    r = r || require(\\"fs\\").readFileSync(e, \\"utf8\\");
   } catch (e) {
     pug_rethrow(n, null, t);
   }
   var a = 3,
-    i = r.split('\\\\n'),
+    i = r.split(\\"\\\\n\\"),
     o = Math.max(t - a, 0),
     h = Math.min(i.length, t + a),
     a = i
       .slice(o, h)
       .map(function(n, e) {
         var r = e + o + 1;
-        return (r == t ? '  > ' : '    ') + r + '| ' + n;
+        return (r == t ? \\"  > \\" : \\"    \\") + r + \\"| \\" + n;
       })
-      .join('\\\\n');
+      .join(\\"\\\\n\\");
   n.path = e;
   try {
-    n.message = (e || 'Pug') + ':' + t + '\\\\n' + a + '\\\\n\\\\n' + n.message;
+    n.message = (e || \\"Pug\\") + \\":\\" + t + \\"\\\\n\\" + a + \\"\\\\n\\\\n\\" + n.message;
   } catch (n) {}
   throw n;
 }
 function template(locals) {
-  var pug_html = '',
+  var pug_html = \\"\\",
     pug_mixins = {},
     pug_interp;
   var pug_debug_filename, pug_debug_line;
@@ -94,8 +94,8 @@ function template(locals) {
     pug_debug_line = 1;
     pug_html =
       pug_html +
-      pug_escape(null == (pug_interp = self.foo) ? '' : pug_interp) +
-      '\\\\u003C\\\\u002Fdiv\\\\u003E';
+      pug_escape(null == (pug_interp = self.foo) ? \\"\\" : pug_interp) +
+      \\"\\\\u003C\\\\u002Fdiv\\\\u003E\\";
   } catch (err) {
     pug_rethrow(err, pug_debug_filename, pug_debug_line);
   }
diff --git a/scripts/prettier-javascript-serializer.js b/scripts/prettier-javascript-serializer.js
index bee91b90e..ea034b312 100644
--- a/scripts/prettier-javascript-serializer.js
+++ b/scripts/prettier-javascript-serializer.js
@@ -1,16 +1,6 @@
-const fs = require('fs');
-const path = require('path');
 const prettier = require('prettier');
 
-const prettierrc = require('../.prettierrc.js');
-const prettierOptions = Object.assign(
-  {
-    trailingComma:
-      /** @type {import('prettier').ParserOptions['trailingComma']} */ ('es5'),
-  },
-  prettierrc,
-  prettierrc.overrides[0].options
-);
+const prettierOptions = {parser: 'babel'};
 
 // filename serializer that removes the basedir
 module.exports = {

From 9e96bb722c706a2fc89bce401e4ba215205bd9b1 Mon Sep 17 00:00:00 2001
From: Alex <brewingcode@users.noreply.github.com>
Date: Tue, 19 May 2020 15:55:21 -0700
Subject: [PATCH 88/96] feat: allow filters to read non-text include files
 (#3213)

---
 package.json                                  |  3 ++-
 packages/pug-filters/lib/handle-filters.js    | 16 ++++++++++++----
 packages/pug-load/index.js                    | 10 ++++++----
 .../test/__snapshots__/index.test.js.snap     | 15 +++++++++++++++
 scripts/buffer-serializer.js                  | 19 +++++++++++++++++++
 5 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 scripts/buffer-serializer.js

diff --git a/package.json b/package.json
index 1087ae2d9..5988a3c4f 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     "testEnvironment": "node",
     "snapshotSerializers": [
       "./scripts/filename-serializer.js",
-      "./scripts/prettier-javascript-serializer.js"
+      "./scripts/prettier-javascript-serializer.js",
+      "./scripts/buffer-serializer.js"
     ]
   },
   "license": "MIT",
diff --git a/packages/pug-filters/lib/handle-filters.js b/packages/pug-filters/lib/handle-filters.js
index 6696290e8..884a50138 100644
--- a/packages/pug-filters/lib/handle-filters.js
+++ b/packages/pug-filters/lib/handle-filters.js
@@ -24,9 +24,13 @@ function handleFilters(ast, filters, options, filterAliases) {
         var firstFilter = node.filters.pop();
         var attrs = getAttributes(firstFilter, options);
         var filename = (attrs.filename = node.file.fullPath);
-        var str = node.file.str;
         node.type = 'Text';
-        node.val = filterFileWithFallback(firstFilter, filename, str, attrs);
+        node.val = filterFileWithFallback(
+          firstFilter,
+          filename,
+          node.file,
+          attrs
+        );
         node.filters
           .slice()
           .reverse()
@@ -55,10 +59,14 @@ function handleFilters(ast, filters, options, filterAliases) {
         }
       }
 
-      function filterFileWithFallback(filter, filename, text, attrs) {
+      function filterFileWithFallback(filter, filename, file, attrs) {
         var filterName = getFilterName(filter);
         if (filters && filters[filterName]) {
-          return filters[filterName](text, attrs);
+          if (filters[filterName].renderBuffer) {
+            return filters[filterName].renderBuffer(file.raw, attrs);
+          } else {
+            return filters[filterName](file.str, attrs);
+          }
         } else {
           return filterWithFallback(filter, filename, attrs, 'renderFile');
         }
diff --git a/packages/pug-load/index.js b/packages/pug-load/index.js
index 1eb1ffcb1..92ae0395c 100644
--- a/packages/pug-load/index.js
+++ b/packages/pug-load/index.js
@@ -21,16 +21,18 @@ function load(ast, options) {
         if (file.type !== 'FileReference') {
           throw new Error('Expected file.type to be "FileReference"');
         }
-        var path, str;
+        var path, str, raw;
         try {
           path = options.resolve(file.path, file.filename, options);
           file.fullPath = path;
-          str = options.read(path, options);
+          raw = options.read(path, options);
+          str = raw.toString('utf8');
         } catch (ex) {
           ex.message += '\n    at ' + node.filename + ' line ' + node.line;
           throw ex;
         }
         file.str = str;
+        file.raw = raw;
         if (node.type === 'Extends' || node.type === 'Include') {
           file.ast = load.string(
             str,
@@ -56,7 +58,7 @@ load.file = function loadFile(filename, options) {
   options = assign(getOptions(options), {
     filename: filename,
   });
-  var str = options.read(filename);
+  var str = options.read(filename).toString('utf8');
   return load.string(str, options);
 };
 
@@ -80,7 +82,7 @@ load.resolve = function resolve(filename, source, options) {
   return filename;
 };
 load.read = function read(filename, options) {
-  return fs.readFileSync(filename, 'utf8');
+  return fs.readFileSync(filename);
 };
 
 load.validateOptions = function validateOptions(options) {
diff --git a/packages/pug-load/test/__snapshots__/index.test.js.snap b/packages/pug-load/test/__snapshots__/index.test.js.snap
index 1fd0b4beb..6ad59e8c7 100644
--- a/packages/pug-load/test/__snapshots__/index.test.js.snap
+++ b/packages/pug-load/test/__snapshots__/index.test.js.snap
@@ -29,6 +29,11 @@ Object {
         "fullPath": "<dirname>/bar.pug",
         "line": 1,
         "path": "bar.pug",
+        "raw": Object {
+          "hash": "538bf7d4b81ef364b1f2e9d42c11f156",
+          "size": 11,
+          "type": "Buffer",
+        },
         "str": "block bing
 ",
         "type": "FileReference",
@@ -99,6 +104,11 @@ Object {
             "fullPath": "<dirname>/bing.pug",
             "line": 4,
             "path": "bing.pug",
+            "raw": Object {
+              "hash": "58ecbe086e7a045084cbddac849a2563",
+              "size": 11,
+              "type": "Buffer",
+            },
             "str": ".bing bong
 ",
             "type": "FileReference",
@@ -122,6 +132,11 @@ Object {
                   "fullPath": "<dirname>/script.js",
                   "line": 6,
                   "path": "script.js",
+                  "raw": Object {
+                    "hash": "86d4f8e34165faeb09f10255121078f8",
+                    "size": 32,
+                    "type": "Buffer",
+                  },
                   "str": "document.write('hello world!');
 ",
                   "type": "FileReference",
diff --git a/scripts/buffer-serializer.js b/scripts/buffer-serializer.js
new file mode 100644
index 000000000..ace36985d
--- /dev/null
+++ b/scripts/buffer-serializer.js
@@ -0,0 +1,19 @@
+const crypto = require('crypto');
+
+// Buffer serializer to reduce snapshot gore for Node Buffer type
+module.exports = {
+  test: function(val) {
+    return val && Buffer.isBuffer(val);
+  },
+  print: function(val, serialize, indent) {
+    const output = {
+      type: 'Buffer',
+      size: val.length,
+      hash: crypto
+        .createHash('md5')
+        .update(val)
+        .digest('hex'),
+    };
+    return serialize(output);
+  },
+};

From eca9342bf3046e5170301d8839df551c1fe35d99 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Tue, 19 May 2020 23:56:13 +0100
Subject: [PATCH 89/96] chore: update is-expression and jest (#3253)

This means we pull in the current latest version of acorn, resulting in a single version everywhere, rather than multiple copies of acorn in this repo.
---
 package.json                    |    2 +-
 packages/pug-lexer/package.json |    2 +-
 yarn.lock                       | 2589 ++++++++++++++++++-------------
 3 files changed, 1520 insertions(+), 1073 deletions(-)

diff --git a/package.json b/package.json
index 5988a3c4f..c2deaae5b 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   ],
   "devDependencies": {
     "coveralls": "3.0.9",
-    "jest": "24.9.0",
+    "jest": "^26.0.1",
     "prettier": "1.19.1"
   },
   "repository": {
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index c8b8f420b..f9b41c48f 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -7,7 +7,7 @@
   ],
   "dependencies": {
     "character-parser": "^2.2.0",
-    "is-expression": "^3.0.0",
+    "is-expression": "^4.0.0",
     "pug-error": "^1.3.3"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a1b497321..187e19487 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -30,7 +30,29 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.8.6", "@babel/generator@^7.8.7":
+"@babel/core@^7.7.5":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
+  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.6"
+    "@babel/helper-module-transforms" "^7.9.0"
+    "@babel/helpers" "^7.9.6"
+    "@babel/parser" "^7.9.6"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.8.6", "@babel/generator@^7.8.7":
   version "7.8.8"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e"
   integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==
@@ -40,6 +62,16 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
+"@babel/generator@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
+  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+  dependencies:
+    "@babel/types" "^7.9.6"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
@@ -49,6 +81,15 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helper-function-name@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.8.3"
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.9.5"
+
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
@@ -56,11 +97,63 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0":
+"@babel/helper-member-expression-to-functions@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
+  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-imports@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
+  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-module-transforms@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
+  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-replace-supers" "^7.8.6"
+    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/template" "^7.8.6"
+    "@babel/types" "^7.9.0"
+    lodash "^4.17.13"
+
+"@babel/helper-optimise-call-expression@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
+  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+  dependencies:
+    "@babel/types" "^7.8.3"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
+"@babel/helper-replace-supers@^7.8.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
+  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.8.3"
+    "@babel/helper-optimise-call-expression" "^7.8.3"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
+
+"@babel/helper-simple-access@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
+  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/types" "^7.8.3"
+
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
@@ -68,6 +161,11 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-validator-identifier@^7.9.5":
+  version "7.9.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+
 "@babel/helpers@^7.8.4":
   version "7.8.4"
   resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
@@ -77,6 +175,15 @@
     "@babel/traverse" "^7.8.4"
     "@babel/types" "^7.8.3"
 
+"@babel/helpers@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
+  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
+  dependencies:
+    "@babel/template" "^7.8.3"
+    "@babel/traverse" "^7.9.6"
+    "@babel/types" "^7.9.6"
+
 "@babel/highlight@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
@@ -86,19 +193,87 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7":
+"@babel/parser@^7.1.0", "@babel/parser@^7.6.0", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7":
   version "7.8.8"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4"
   integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0":
+"@babel/parser@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
+  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7"
+  integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897"
+  integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
+  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/template@^7.4.0", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/template@^7.3.3", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
   resolved "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
   integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
@@ -107,7 +282,7 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
   version "7.8.6"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
   integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
@@ -122,7 +297,22 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.6.1", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
+"@babel/traverse@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
+  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.6"
+    "@babel/helper-function-name" "^7.9.5"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.6"
+    "@babel/types" "^7.9.6"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.6.1", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
   version "7.8.7"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
   integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
@@ -131,6 +321,20 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.3.3", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
+  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.9.5"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
   resolved "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
@@ -139,144 +343,176 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@jest/console@^24.7.1", "@jest/console@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
-  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
+  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
   dependencies:
-    "@jest/source-map" "^24.9.0"
-    chalk "^2.0.1"
-    slash "^2.0.0"
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
 
-"@jest/core@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4"
-  integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/reporters" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+
+"@jest/console@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.0.1.tgz#62b3b2fa8990f3cbffbef695c42ae9ddbc8f4b39"
+  integrity sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==
+  dependencies:
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
+    jest-message-util "^26.0.1"
+    jest-util "^26.0.1"
+    slash "^3.0.0"
+
+"@jest/core@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.0.1.tgz#aa538d52497dfab56735efb00e506be83d841fae"
+  integrity sha512-Xq3eqYnxsG9SjDC+WLeIgf7/8KU6rddBxH+SCt18gEpOhAGYC/Mq+YbtlNcIdwjnnT+wDseXSbU0e5X84Y4jTQ==
+  dependencies:
+    "@jest/console" "^26.0.1"
+    "@jest/reporters" "^26.0.1"
+    "@jest/test-result" "^26.0.1"
+    "@jest/transform" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
     exit "^0.1.2"
-    graceful-fs "^4.1.15"
-    jest-changed-files "^24.9.0"
-    jest-config "^24.9.0"
-    jest-haste-map "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.9.0"
-    jest-resolve-dependencies "^24.9.0"
-    jest-runner "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-snapshot "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
-    jest-watcher "^24.9.0"
-    micromatch "^3.1.10"
-    p-each-series "^1.0.0"
-    realpath-native "^1.1.0"
-    rimraf "^2.5.4"
-    slash "^2.0.0"
-    strip-ansi "^5.0.0"
-
-"@jest/environment@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18"
-  integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==
-  dependencies:
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    jest-mock "^24.9.0"
-
-"@jest/fake-timers@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
-  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-mock "^24.9.0"
-
-"@jest/reporters@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43"
-  integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==
-  dependencies:
-    "@jest/environment" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
+    graceful-fs "^4.2.4"
+    jest-changed-files "^26.0.1"
+    jest-config "^26.0.1"
+    jest-haste-map "^26.0.1"
+    jest-message-util "^26.0.1"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.0.1"
+    jest-resolve-dependencies "^26.0.1"
+    jest-runner "^26.0.1"
+    jest-runtime "^26.0.1"
+    jest-snapshot "^26.0.1"
+    jest-util "^26.0.1"
+    jest-validate "^26.0.1"
+    jest-watcher "^26.0.1"
+    micromatch "^4.0.2"
+    p-each-series "^2.1.0"
+    rimraf "^3.0.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
+"@jest/environment@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.0.1.tgz#82f519bba71959be9b483675ee89de8c8f72a5c8"
+  integrity sha512-xBDxPe8/nx251u0VJ2dFAFz2H23Y98qdIaNwnMK6dFQr05jc+Ne/2np73lOAx+5mSBO/yuQldRrQOf6hP1h92g==
+  dependencies:
+    "@jest/fake-timers" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    jest-mock "^26.0.1"
+
+"@jest/fake-timers@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.0.1.tgz#f7aeff13b9f387e9d0cac9a8de3bba538d19d796"
+  integrity sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg==
+  dependencies:
+    "@jest/types" "^26.0.1"
+    "@sinonjs/fake-timers" "^6.0.1"
+    jest-message-util "^26.0.1"
+    jest-mock "^26.0.1"
+    jest-util "^26.0.1"
+
+"@jest/globals@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.0.1.tgz#3f67b508a7ce62b6e6efc536f3d18ec9deb19a9c"
+  integrity sha512-iuucxOYB7BRCvT+TYBzUqUNuxFX1hqaR6G6IcGgEqkJ5x4htNKo1r7jk1ji9Zj8ZMiMw0oB5NaA7k5Tx6MVssA==
+  dependencies:
+    "@jest/environment" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    expect "^26.0.1"
+
+"@jest/reporters@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.0.1.tgz#14ae00e7a93e498cec35b0c00ab21c375d9b078f"
+  integrity sha512-NWWy9KwRtE1iyG/m7huiFVF9YsYv/e+mbflKRV84WDoJfBqUrNRyDbL/vFxQcYLl8IRqI4P3MgPn386x76Gf2g==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^26.0.1"
+    "@jest/test-result" "^26.0.1"
+    "@jest/transform" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.2"
-    istanbul-lib-coverage "^2.0.2"
-    istanbul-lib-instrument "^3.0.1"
-    istanbul-lib-report "^2.0.4"
-    istanbul-lib-source-maps "^3.0.1"
-    istanbul-reports "^2.2.6"
-    jest-haste-map "^24.9.0"
-    jest-resolve "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.6.0"
-    node-notifier "^5.4.2"
-    slash "^2.0.0"
+    graceful-fs "^4.2.4"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.0.2"
+    jest-haste-map "^26.0.1"
+    jest-resolve "^26.0.1"
+    jest-util "^26.0.1"
+    jest-worker "^26.0.0"
+    slash "^3.0.0"
     source-map "^0.6.0"
-    string-length "^2.0.0"
+    string-length "^4.0.1"
+    terminal-link "^2.0.0"
+    v8-to-istanbul "^4.1.3"
+  optionalDependencies:
+    node-notifier "^7.0.0"
 
-"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
-  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
+"@jest/source-map@^26.0.0":
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.0.0.tgz#fd7706484a7d3faf7792ae29783933bbf48a4749"
+  integrity sha512-S2Z+Aj/7KOSU2TfW0dyzBze7xr95bkm5YXNUqqCek+HE0VbNNSNzrRwfIi5lf7wvzDTSS0/ib8XQ1krFNyYgbQ==
   dependencies:
     callsites "^3.0.0"
-    graceful-fs "^4.1.15"
+    graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
-  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+"@jest/test-result@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.0.1.tgz#1ffdc1ba4bc289919e54b9414b74c9c2f7b2b718"
+  integrity sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==
   dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/types" "^24.9.0"
+    "@jest/console" "^26.0.1"
+    "@jest/types" "^26.0.1"
     "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31"
-  integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==
+"@jest/test-sequencer@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.0.1.tgz#b0563424728f3fe9e75d1442b9ae4c11da73f090"
+  integrity sha512-ssga8XlwfP8YjbDcmVhwNlrmblddMfgUeAkWIXts1V22equp2GMIHxm7cyeD5Q/B0ZgKPK/tngt45sH99yLLGg==
   dependencies:
-    "@jest/test-result" "^24.9.0"
-    jest-haste-map "^24.9.0"
-    jest-runner "^24.9.0"
-    jest-runtime "^24.9.0"
+    "@jest/test-result" "^26.0.1"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.0.1"
+    jest-runner "^26.0.1"
+    jest-runtime "^26.0.1"
 
-"@jest/transform@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
-  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
+"@jest/transform@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.0.1.tgz#0e3ecbb34a11cd4b2080ed0a9c4856cf0ceb0639"
+  integrity sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^24.9.0"
-    babel-plugin-istanbul "^5.1.0"
-    chalk "^2.0.1"
+    "@jest/types" "^26.0.1"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.15"
-    jest-haste-map "^24.9.0"
-    jest-regex-util "^24.9.0"
-    jest-util "^24.9.0"
-    micromatch "^3.1.10"
+    graceful-fs "^4.2.4"
+    jest-haste-map "^26.0.1"
+    jest-regex-util "^26.0.0"
+    jest-util "^26.0.1"
+    micromatch "^4.0.2"
     pirates "^4.0.1"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
+    slash "^3.0.0"
     source-map "^0.6.1"
-    write-file-atomic "2.4.1"
+    write-file-atomic "^3.0.0"
 
 "@jest/types@^24.9.0":
   version "24.9.0"
@@ -287,10 +523,34 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@types/babel__core@^7.1.0":
-  version "7.1.6"
-  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610"
-  integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==
+"@jest/types@^26.0.1":
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.0.1.tgz#b78333fbd113fa7aec8d39de24f88de8686dac67"
+  integrity sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+
+"@sinonjs/commons@^1.7.0":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
+  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
+  integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
+"@types/babel__core@^7.1.7":
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
+  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -320,11 +580,28 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/graceful-fs@^4.1.2":
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f"
+  integrity sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
   integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
 
+"@types/istanbul-lib-coverage@^2.0.1":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
+  integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
+
 "@types/istanbul-lib-report@*":
   version "3.0.0"
   resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
@@ -340,6 +617,21 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/node@*":
+  version "14.0.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.3.tgz#57bcb277f753a3dabfa56cea0a93288aae82143c"
+  integrity sha512-a8TR2N5VEJCL9HEJrAfwv3UI1bZq50HydowDDVV6pfnY7ZwG5Pjii+nSDhrDtGW3XKMoVKOgG8zS/Kv5j399uA==
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/prettier@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.0.tgz#dc85454b953178cc6043df5208b9e949b54a3bc4"
+  integrity sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q==
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -357,49 +649,36 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-abab@^2.0.0:
+"@types/yargs@^15.0.0":
+  version "15.0.5"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
+  integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+abab@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
   integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
-acorn-globals@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
-  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
+acorn-globals@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
   dependencies:
-    acorn "^6.0.1"
-    acorn-walk "^6.0.1"
-
-acorn-walk@^6.0.1:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
-  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
+    acorn "^7.1.1"
+    acorn-walk "^7.1.1"
 
 acorn-walk@^7.1.1:
   version "7.1.1"
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
   integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
 
-acorn@^5.5.3:
-  version "5.7.4"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
-  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
-
-acorn@^6.0.1:
-  version "6.4.1"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
-  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
-
 acorn@^7.1.1:
   version "7.1.1"
   resolved "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
   integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
-acorn@~4.0.2:
-  version "4.0.13"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
-  integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
-
 ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
@@ -432,10 +711,12 @@ amdefine@>=0.0.4:
   resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-ansi-escapes@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -447,18 +728,26 @@ ansi-regex@^3.0.0:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -467,6 +756,14 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -489,11 +786,6 @@ arr-union@^3.1.0:
   resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -531,16 +823,6 @@ assign-symbols@^1.0.0:
   resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 async@~0.2.6:
   version "0.2.10"
   resolved "https://registry.npmjs.org/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -571,43 +853,63 @@ aws4@^1.2.1, aws4@^1.8.0:
   resolved "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
   integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
 
-babel-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
-  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
-  dependencies:
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/babel__core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.9.0"
-    chalk "^2.4.2"
-    slash "^2.0.0"
-
-babel-plugin-istanbul@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
-  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
+babel-jest@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.0.1.tgz#450139ce4b6c17174b136425bda91885c397bc46"
+  integrity sha512-Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw==
+  dependencies:
+    "@jest/transform" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    "@types/babel__core" "^7.1.7"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^26.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    slash "^3.0.0"
+
+babel-plugin-istanbul@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    find-up "^3.0.0"
-    istanbul-lib-instrument "^3.3.0"
-    test-exclude "^5.2.3"
-
-babel-plugin-jest-hoist@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
-  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
-  dependencies:
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^4.0.0"
+    test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz#fd1d35f95cf8849fc65cb01b5e58aedd710b34a8"
+  integrity sha512-+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
     "@types/babel__traverse" "^7.0.6"
 
-babel-preset-jest@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
-  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
-  dependencies:
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    babel-plugin-jest-hoist "^24.9.0"
+babel-preset-current-node-syntax@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
+  integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+babel-preset-jest@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz#1eac82f513ad36c4db2e9263d7c485c825b1faa6"
+  integrity sha512-9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw==
+  dependencies:
+    babel-plugin-jest-hoist "^26.0.0"
+    babel-preset-current-node-syntax "^0.1.2"
 
 babel-runtime@^6.11.6, babel-runtime@^6.26.0:
   version "6.26.0"
@@ -673,13 +975,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -723,18 +1018,18 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browser-resolve@^1.11.3:
-  version "1.11.3"
-  resolved "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
-  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
-  dependencies:
-    resolve "1.1.7"
-
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -782,6 +1077,11 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+camelcase@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
+  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -802,7 +1102,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.3.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -811,6 +1111,19 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
+  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
 character-parser@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
@@ -851,14 +1164,14 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
   dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
 
 clone@^2.0.0:
   version "2.1.2"
@@ -880,6 +1193,11 @@ coffee-script@~1.12.7:
   resolved "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
   integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
 
+collect-v8-coverage@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
+  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -895,11 +1213,23 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -935,7 +1265,7 @@ constantinople@^4.0.1:
     "@babel/parser" "^7.6.0"
     "@babel/types" "^7.6.1"
 
-convert-source-map@^1.4.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -979,6 +1309,15 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
+  integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -991,17 +1330,22 @@ css-parse@1.7.x:
   resolved "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
   integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+cssom@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
   version "0.3.8"
-  resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
-cssstyle@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
-  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
+cssstyle@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
   dependencies:
-    cssom "0.3.x"
+    cssom "~0.3.6"
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -1010,14 +1354,14 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-urls@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
-  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+data-urls@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
   dependencies:
-    abab "^2.0.0"
-    whatwg-mimetype "^2.2.0"
-    whatwg-url "^7.0.0"
+    abab "^2.0.3"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
 
 debug@*, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
@@ -1038,6 +1382,11 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0:
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+decimal.js@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231"
+  integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -1048,12 +1397,10 @@ deep-is@~0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
 define-property@^0.2.5:
   version "0.2.5"
@@ -1082,27 +1429,27 @@ delayed-stream@~1.0.0:
   resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-detect-newline@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+detect-newline@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-diff-sequences@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
-  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
+diff-sequences@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
+  integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==
 
 doctypes@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
   integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
 
-domexception@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
-  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+domexception@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
   dependencies:
-    webidl-conversions "^4.0.2"
+    webidl-conversions "^5.0.0"
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
@@ -1112,10 +1459,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 end-of-stream@^1.1.0:
   version "1.4.4"
@@ -1143,40 +1490,19 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
-  version "1.17.4"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
-  integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escodegen@^1.9.1:
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+escodegen@^1.14.1:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
   integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
   dependencies:
     esprima "^4.0.1"
@@ -1219,6 +1545,21 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.1.tgz#988488781f1f0238cd156f7aaede11c3e853b4c1"
+  integrity sha512-SCjM/zlBdOK8Q5TIjOn6iEHZaPHFsMoTxXQ2nvUvtPnuohz3H2dIozSg+etNR98dGoYUp2ENSKLL/XaMmbxVgw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -1237,17 +1578,17 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
-  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
+expect@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.0.1.tgz#18697b9611a7e2725e20ba3ceadda49bc9865421"
+  integrity sha512-QcCy4nygHeqmbw564YxNbHTJlXh47dVID2BUP52cZFpLU9zHViMFK6h07cC1wf7GYCTIigTdAXhVua8Yl1FkKg==
   dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-styles "^3.2.0"
-    jest-get-type "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-regex-util "^24.9.0"
+    "@jest/types" "^26.0.1"
+    ansi-styles "^4.0.0"
+    jest-get-type "^26.0.0"
+    jest-matcher-utils "^26.0.1"
+    jest-message-util "^26.0.1"
+    jest-regex-util "^26.0.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -1315,11 +1656,6 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -1330,6 +1666,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -1337,12 +1680,13 @@ find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
-    locate-path "^3.0.0"
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -1384,13 +1728,10 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.7:
-  version "1.2.11"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
-  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
+fsevents@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
+  integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
 fstream@^1.0.2:
   version "1.0.12"
@@ -1440,6 +1781,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
+  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -1464,7 +1812,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.6"
   resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -1481,11 +1829,16 @@ globals@^11.1.0:
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
+graceful-fs@^4.1.2:
   version "4.2.3"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
+graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -1522,10 +1875,10 @@ has-flag@^3.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-value@^0.3.1:
   version "0.3.1"
@@ -1585,12 +1938,12 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
-html-encoding-sniffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
-  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+html-encoding-sniffer@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
   dependencies:
-    whatwg-encoding "^1.0.1"
+    whatwg-encoding "^1.0.5"
 
 html-escaper@^2.0.0:
   version "2.0.0"
@@ -1628,6 +1981,11 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -1640,13 +1998,13 @@ image-size@~0.5.0:
   resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+import-local@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
+  integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
   dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -1666,18 +2024,16 @@ inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-invariant@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
   integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -1702,11 +2058,6 @@ is-buffer@^1.1.5:
   resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4, is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -1728,11 +2079,6 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
-
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -1751,13 +2097,18 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
-is-expression@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
-  integrity sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=
+is-docker@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
+  integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==
+
+is-expression@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab"
+  integrity sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==
   dependencies:
-    acorn "~4.0.2"
-    object-assign "^4.0.1"
+    acorn "^7.1.1"
+    object-assign "^4.1.1"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -1783,6 +2134,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-generator-fn@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
@@ -1795,6 +2151,11 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -1802,12 +2163,17 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
+  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+
 is-promise@^2.0.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
-is-regex@^1.0.3, is-regex@^1.0.5:
+is-regex@^1.0.3:
   version "1.0.5"
   resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
   integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
@@ -1819,14 +2185,12 @@ is-stream@^1.1.0:
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -1836,10 +2200,12 @@ is-windows@^1.0.2:
   resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+is-wsl@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
@@ -1868,411 +2234,422 @@ isstream@~0.1.2:
   resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
-istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-report@^2.0.4:
-  version "2.0.8"
-  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
-  dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
-
-istanbul-lib-source-maps@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
-    source-map "^0.6.1"
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-reports@^2.2.6:
-  version "2.2.7"
-  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
-  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
   dependencies:
-    html-escaper "^2.0.0"
-
-jest-changed-files@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
-  integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    execa "^1.0.0"
-    throat "^4.0.0"
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
 
-jest-cli@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af"
-  integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==
+istanbul-lib-report@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
   dependencies:
-    "@jest/core" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
-    exit "^0.1.2"
-    import-local "^2.0.0"
-    is-ci "^2.0.0"
-    jest-config "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
-    prompts "^2.0.1"
-    realpath-native "^1.1.0"
-    yargs "^13.3.0"
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^3.0.0"
+    supports-color "^7.1.0"
 
-jest-config@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5"
-  integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    babel-jest "^24.9.0"
-    chalk "^2.0.1"
-    glob "^7.1.1"
-    jest-environment-jsdom "^24.9.0"
-    jest-environment-node "^24.9.0"
-    jest-get-type "^24.9.0"
-    jest-jasmine2 "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
-    micromatch "^3.1.10"
-    pretty-format "^24.9.0"
-    realpath-native "^1.1.0"
-
-jest-diff@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
-  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
+istanbul-lib-source-maps@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"
+  integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==
   dependencies:
-    chalk "^2.0.1"
-    diff-sequences "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+    source-map "^0.6.1"
 
-jest-docblock@^24.3.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
-  integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
   dependencies:
-    detect-newline "^2.1.0"
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
 
-jest-each@^24.9.0:
+jest-changed-files@^24.9.0:
   version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05"
-  integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==
+  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
+  integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==
   dependencies:
     "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
-    jest-get-type "^24.9.0"
-    jest-util "^24.9.0"
-    pretty-format "^24.9.0"
+    execa "^1.0.0"
+    throat "^4.0.0"
 
-jest-environment-jsdom@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b"
-  integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==
+jest-changed-files@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.0.1.tgz#1334630c6a1ad75784120f39c3aa9278e59f349f"
+  integrity sha512-q8LP9Sint17HaE2LjxQXL+oYWW/WeeXMPE2+Op9X3mY8IEGFVc14xRxFjUuXUbcPAlDLhtWdIEt59GdQbn76Hw==
   dependencies:
-    "@jest/environment" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    jest-mock "^24.9.0"
-    jest-util "^24.9.0"
-    jsdom "^11.5.1"
+    "@jest/types" "^26.0.1"
+    execa "^4.0.0"
+    throat "^5.0.0"
 
-jest-environment-node@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3"
-  integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==
+jest-cli@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.0.1.tgz#3a42399a4cbc96a519b99ad069a117d955570cac"
+  integrity sha512-pFLfSOBcbG9iOZWaMK4Een+tTxi/Wcm34geqZEqrst9cZDkTQ1LZ2CnBrTlHWuYAiTMFr0EQeK52ScyFU8wK+w==
   dependencies:
-    "@jest/environment" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    jest-mock "^24.9.0"
-    jest-util "^24.9.0"
-
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
-  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
+    "@jest/core" "^26.0.1"
+    "@jest/test-result" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.4"
+    import-local "^3.0.2"
+    is-ci "^2.0.0"
+    jest-config "^26.0.1"
+    jest-util "^26.0.1"
+    jest-validate "^26.0.1"
+    prompts "^2.0.1"
+    yargs "^15.3.1"
 
-jest-haste-map@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
-  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
+jest-config@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.0.1.tgz#096a3d4150afadf719d1fab00e9a6fb2d6d67507"
+  integrity sha512-9mWKx2L1LFgOXlDsC4YSeavnblN6A4CPfXFiobq+YYLaBMymA/SczN7xYTSmLaEYHZOcB98UdoN4m5uNt6tztg==
   dependencies:
-    "@jest/types" "^24.9.0"
-    anymatch "^2.0.0"
+    "@babel/core" "^7.1.0"
+    "@jest/test-sequencer" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    babel-jest "^26.0.1"
+    chalk "^4.0.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.1"
+    graceful-fs "^4.2.4"
+    jest-environment-jsdom "^26.0.1"
+    jest-environment-node "^26.0.1"
+    jest-get-type "^26.0.0"
+    jest-jasmine2 "^26.0.1"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.0.1"
+    jest-util "^26.0.1"
+    jest-validate "^26.0.1"
+    micromatch "^4.0.2"
+    pretty-format "^26.0.1"
+
+jest-diff@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.0.1.tgz#c44ab3cdd5977d466de69c46929e0e57f89aa1de"
+  integrity sha512-odTcHyl5X+U+QsczJmOjWw5tPvww+y9Yim5xzqxVl/R1j4z71+fHW4g8qu1ugMmKdFdxw+AtQgs5mupPnzcIBQ==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^26.0.0"
+    jest-get-type "^26.0.0"
+    pretty-format "^26.0.1"
+
+jest-docblock@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
+  integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==
+  dependencies:
+    detect-newline "^3.0.0"
+
+jest-each@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.0.1.tgz#633083061619302fc90dd8f58350f9d77d67be04"
+  integrity sha512-OTgJlwXCAR8NIWaXFL5DBbeS4QIYPuNASkzSwMCJO+ywo9BEa6TqkaSWsfR7VdbMLdgYJqSfQcIyjJCNwl5n4Q==
+  dependencies:
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
+    jest-get-type "^26.0.0"
+    jest-util "^26.0.1"
+    pretty-format "^26.0.1"
+
+jest-environment-jsdom@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.0.1.tgz#217690852e5bdd7c846a4e3b50c8ffd441dfd249"
+  integrity sha512-u88NJa3aptz2Xix2pFhihRBAatwZHWwSiRLBDBQE1cdJvDjPvv7ZGA0NQBxWwDDn7D0g1uHqxM8aGgfA9Bx49g==
+  dependencies:
+    "@jest/environment" "^26.0.1"
+    "@jest/fake-timers" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    jest-mock "^26.0.1"
+    jest-util "^26.0.1"
+    jsdom "^16.2.2"
+
+jest-environment-node@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.0.1.tgz#584a9ff623124ff6eeb49e0131b5f7612b310b13"
+  integrity sha512-4FRBWcSn5yVo0KtNav7+5NH5Z/tEgDLp7VRQVS5tCouWORxj+nI+1tOLutM07Zb2Qi7ja+HEDoOUkjBSWZg/IQ==
+  dependencies:
+    "@jest/environment" "^26.0.1"
+    "@jest/fake-timers" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    jest-mock "^26.0.1"
+    jest-util "^26.0.1"
+
+jest-get-type@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039"
+  integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==
+
+jest-haste-map@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.0.1.tgz#40dcc03c43ac94d25b8618075804d09cd5d49de7"
+  integrity sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==
+  dependencies:
+    "@jest/types" "^26.0.1"
+    "@types/graceful-fs" "^4.1.2"
+    anymatch "^3.0.3"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.1.15"
-    invariant "^2.2.4"
-    jest-serializer "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.9.0"
-    micromatch "^3.1.10"
+    graceful-fs "^4.2.4"
+    jest-serializer "^26.0.0"
+    jest-util "^26.0.1"
+    jest-worker "^26.0.0"
+    micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
+    which "^2.0.2"
   optionalDependencies:
-    fsevents "^1.2.7"
+    fsevents "^2.1.2"
 
-jest-jasmine2@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
-  integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==
+jest-jasmine2@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.0.1.tgz#947c40ee816636ba23112af3206d6fa7b23c1c1c"
+  integrity sha512-ILaRyiWxiXOJ+RWTKupzQWwnPaeXPIoLS5uW41h18varJzd9/7I0QJGqg69fhTT1ev9JpSSo9QtalriUN0oqOg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
+    "@jest/environment" "^26.0.1"
+    "@jest/source-map" "^26.0.0"
+    "@jest/test-result" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
     co "^4.6.0"
-    expect "^24.9.0"
+    expect "^26.0.1"
     is-generator-fn "^2.0.0"
-    jest-each "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-snapshot "^24.9.0"
-    jest-util "^24.9.0"
-    pretty-format "^24.9.0"
-    throat "^4.0.0"
-
-jest-leak-detector@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a"
-  integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==
-  dependencies:
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-matcher-utils@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
-  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
-  dependencies:
-    chalk "^2.0.1"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    pretty-format "^24.9.0"
-
-jest-message-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
-  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
+    jest-each "^26.0.1"
+    jest-matcher-utils "^26.0.1"
+    jest-message-util "^26.0.1"
+    jest-runtime "^26.0.1"
+    jest-snapshot "^26.0.1"
+    jest-util "^26.0.1"
+    pretty-format "^26.0.1"
+    throat "^5.0.0"
+
+jest-leak-detector@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.0.1.tgz#79b19ab3f41170e0a78eb8fa754a116d3447fb8c"
+  integrity sha512-93FR8tJhaYIWrWsbmVN1pQ9ZNlbgRpfvrnw5LmgLRX0ckOJ8ut/I35CL7awi2ecq6Ca4lL59bEK9hr7nqoHWPA==
+  dependencies:
+    jest-get-type "^26.0.0"
+    pretty-format "^26.0.1"
+
+jest-matcher-utils@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz#12e1fc386fe4f14678f4cc8dbd5ba75a58092911"
+  integrity sha512-PUMlsLth0Azen8Q2WFTwnSkGh2JZ8FYuwijC8NR47vXKpsrKmA1wWvgcj1CquuVfcYiDEdj985u5Wmg7COEARw==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^26.0.1"
+    jest-get-type "^26.0.0"
+    pretty-format "^26.0.1"
+
+jest-message-util@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.0.1.tgz#07af1b42fc450b4cc8e90e4c9cef11b33ce9b0ac"
+  integrity sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
+    "@jest/types" "^26.0.1"
     "@types/stack-utils" "^1.0.1"
-    chalk "^2.0.1"
-    micromatch "^3.1.10"
-    slash "^2.0.0"
-    stack-utils "^1.0.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    micromatch "^4.0.2"
+    slash "^3.0.0"
+    stack-utils "^2.0.2"
 
-jest-mock@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
-  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
+jest-mock@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.0.1.tgz#7fd1517ed4955397cf1620a771dc2d61fad8fd40"
+  integrity sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q==
   dependencies:
-    "@jest/types" "^24.9.0"
+    "@jest/types" "^26.0.1"
 
 jest-pnp-resolver@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
   integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
 
-jest-regex-util@^24.3.0, jest-regex-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
-  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
+jest-regex-util@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
+  integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
-  integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==
+jest-resolve-dependencies@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.0.1.tgz#607ba7ccc32151d185a477cff45bf33bce417f0b"
+  integrity sha512-9d5/RS/ft0vB/qy7jct/qAhzJsr6fRQJyGAFigK3XD4hf9kIbEH5gks4t4Z7kyMRhowU6HWm/o8ILqhaHdSqLw==
   dependencies:
-    "@jest/types" "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-snapshot "^24.9.0"
+    "@jest/types" "^26.0.1"
+    jest-regex-util "^26.0.0"
+    jest-snapshot "^26.0.1"
 
-jest-resolve@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321"
-  integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==
+jest-resolve@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.0.1.tgz#21d1ee06f9ea270a343a8893051aeed940cde736"
+  integrity sha512-6jWxk0IKZkPIVTvq6s72RH735P8f9eCJW3IM5CX/SJFeKq1p2cZx0U49wf/SdMlhaB/anann5J2nCJj6HrbezQ==
   dependencies:
-    "@jest/types" "^24.9.0"
-    browser-resolve "^1.11.3"
-    chalk "^2.0.1"
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
     jest-pnp-resolver "^1.2.1"
-    realpath-native "^1.1.0"
-
-jest-runner@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42"
-  integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/environment" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.4.2"
+    jest-util "^26.0.1"
+    read-pkg-up "^7.0.1"
+    resolve "^1.17.0"
+    slash "^3.0.0"
+
+jest-runner@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.0.1.tgz#ea03584b7ae4bacfb7e533d680a575a49ae35d50"
+  integrity sha512-CApm0g81b49Znm4cZekYQK67zY7kkB4umOlI2Dx5CwKAzdgw75EN+ozBHRvxBzwo1ZLYZ07TFxkaPm+1t4d8jA==
+  dependencies:
+    "@jest/console" "^26.0.1"
+    "@jest/environment" "^26.0.1"
+    "@jest/test-result" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
     exit "^0.1.2"
-    graceful-fs "^4.1.15"
-    jest-config "^24.9.0"
-    jest-docblock "^24.3.0"
-    jest-haste-map "^24.9.0"
-    jest-jasmine2 "^24.9.0"
-    jest-leak-detector "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-resolve "^24.9.0"
-    jest-runtime "^24.9.0"
-    jest-util "^24.9.0"
-    jest-worker "^24.6.0"
+    graceful-fs "^4.2.4"
+    jest-config "^26.0.1"
+    jest-docblock "^26.0.0"
+    jest-haste-map "^26.0.1"
+    jest-jasmine2 "^26.0.1"
+    jest-leak-detector "^26.0.1"
+    jest-message-util "^26.0.1"
+    jest-resolve "^26.0.1"
+    jest-runtime "^26.0.1"
+    jest-util "^26.0.1"
+    jest-worker "^26.0.0"
     source-map-support "^0.5.6"
-    throat "^4.0.0"
-
-jest-runtime@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac"
-  integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==
-  dependencies:
-    "@jest/console" "^24.7.1"
-    "@jest/environment" "^24.9.0"
-    "@jest/source-map" "^24.3.0"
-    "@jest/transform" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/yargs" "^13.0.0"
-    chalk "^2.0.1"
+    throat "^5.0.0"
+
+jest-runtime@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.0.1.tgz#a121a6321235987d294168e282d52b364d7d3f89"
+  integrity sha512-Ci2QhYFmANg5qaXWf78T2Pfo6GtmIBn2rRaLnklRyEucmPccmCKvS9JPljcmtVamsdMmkyNkVFb9pBTD6si9Lw==
+  dependencies:
+    "@jest/console" "^26.0.1"
+    "@jest/environment" "^26.0.1"
+    "@jest/fake-timers" "^26.0.1"
+    "@jest/globals" "^26.0.1"
+    "@jest/source-map" "^26.0.0"
+    "@jest/test-result" "^26.0.1"
+    "@jest/transform" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
-    graceful-fs "^4.1.15"
-    jest-config "^24.9.0"
-    jest-haste-map "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-mock "^24.9.0"
-    jest-regex-util "^24.3.0"
-    jest-resolve "^24.9.0"
-    jest-snapshot "^24.9.0"
-    jest-util "^24.9.0"
-    jest-validate "^24.9.0"
-    realpath-native "^1.1.0"
-    slash "^2.0.0"
-    strip-bom "^3.0.0"
-    yargs "^13.3.0"
-
-jest-serializer@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
-  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
-
-jest-snapshot@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
-  integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==
+    graceful-fs "^4.2.4"
+    jest-config "^26.0.1"
+    jest-haste-map "^26.0.1"
+    jest-message-util "^26.0.1"
+    jest-mock "^26.0.1"
+    jest-regex-util "^26.0.0"
+    jest-resolve "^26.0.1"
+    jest-snapshot "^26.0.1"
+    jest-util "^26.0.1"
+    jest-validate "^26.0.1"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+    yargs "^15.3.1"
+
+jest-serializer@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.0.0.tgz#f6c521ddb976943b93e662c0d4d79245abec72a3"
+  integrity sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==
+  dependencies:
+    graceful-fs "^4.2.4"
+
+jest-snapshot@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.0.1.tgz#1baa942bd83d47b837a84af7fcf5fd4a236da399"
+  integrity sha512-jxd+cF7+LL+a80qh6TAnTLUZHyQoWwEHSUFJjkw35u3Gx+BZUNuXhYvDqHXr62UQPnWo2P6fvQlLjsU93UKyxA==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^24.9.0"
-    chalk "^2.0.1"
-    expect "^24.9.0"
-    jest-diff "^24.9.0"
-    jest-get-type "^24.9.0"
-    jest-matcher-utils "^24.9.0"
-    jest-message-util "^24.9.0"
-    jest-resolve "^24.9.0"
-    mkdirp "^0.5.1"
+    "@jest/types" "^26.0.1"
+    "@types/prettier" "^2.0.0"
+    chalk "^4.0.0"
+    expect "^26.0.1"
+    graceful-fs "^4.2.4"
+    jest-diff "^26.0.1"
+    jest-get-type "^26.0.0"
+    jest-matcher-utils "^26.0.1"
+    jest-message-util "^26.0.1"
+    jest-resolve "^26.0.1"
+    make-dir "^3.0.0"
     natural-compare "^1.4.0"
-    pretty-format "^24.9.0"
-    semver "^6.2.0"
+    pretty-format "^26.0.1"
+    semver "^7.3.2"
 
-jest-util@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
-  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
+jest-util@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.0.1.tgz#72c4c51177b695fdd795ca072a6f94e3d7cef00a"
+  integrity sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==
   dependencies:
-    "@jest/console" "^24.9.0"
-    "@jest/fake-timers" "^24.9.0"
-    "@jest/source-map" "^24.9.0"
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    callsites "^3.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.15"
+    "@jest/types" "^26.0.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
     is-ci "^2.0.0"
-    mkdirp "^0.5.1"
-    slash "^2.0.0"
-    source-map "^0.6.0"
+    make-dir "^3.0.0"
 
-jest-validate@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
-  integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==
+jest-validate@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.0.1.tgz#a62987e1da5b7f724130f904725e22f4e5b2e23c"
+  integrity sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA==
   dependencies:
-    "@jest/types" "^24.9.0"
-    camelcase "^5.3.1"
-    chalk "^2.0.1"
-    jest-get-type "^24.9.0"
+    "@jest/types" "^26.0.1"
+    camelcase "^6.0.0"
+    chalk "^4.0.0"
+    jest-get-type "^26.0.0"
     leven "^3.1.0"
-    pretty-format "^24.9.0"
+    pretty-format "^26.0.1"
 
-jest-watcher@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b"
-  integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==
+jest-watcher@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.0.1.tgz#5b5e3ebbdf10c240e22a98af66d645631afda770"
+  integrity sha512-pdZPydsS8475f89kGswaNsN3rhP6lnC3/QDCppP7bg1L9JQz7oU9Mb/5xPETk1RHDCWeqmVC47M4K5RR7ejxFw==
   dependencies:
-    "@jest/test-result" "^24.9.0"
-    "@jest/types" "^24.9.0"
-    "@types/yargs" "^13.0.0"
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    jest-util "^24.9.0"
-    string-length "^2.0.0"
+    "@jest/test-result" "^26.0.1"
+    "@jest/types" "^26.0.1"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    jest-util "^26.0.1"
+    string-length "^4.0.1"
 
-jest-worker@^24.6.0, jest-worker@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+jest-worker@^26.0.0:
+  version "26.0.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.0.0.tgz#4920c7714f0a96c6412464718d0c58a3df3fb066"
+  integrity sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==
   dependencies:
     merge-stream "^2.0.0"
-    supports-color "^6.1.0"
+    supports-color "^7.0.0"
 
-jest@24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
-  integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==
+jest@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.0.1.tgz#5c51a2e58dff7525b65f169721767173bf832694"
+  integrity sha512-29Q54kn5Bm7ZGKIuH2JRmnKl85YRigp0o0asTc6Sb6l2ch1DCXIeZTLLFy9ultJvhkTqbswF5DEx4+RlkmCxWg==
   dependencies:
-    import-local "^2.0.0"
-    jest-cli "^24.9.0"
+    "@jest/core" "^26.0.1"
+    import-local "^3.0.2"
+    jest-cli "^26.0.1"
 
 js-stringify@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
   integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -2290,36 +2667,36 @@ jsbn@~0.1.0:
   resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^11.5.1:
-  version "11.12.0"
-  resolved "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
-  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
-  dependencies:
-    abab "^2.0.0"
-    acorn "^5.5.3"
-    acorn-globals "^4.1.0"
-    array-equal "^1.0.0"
-    cssom ">= 0.3.2 < 0.4.0"
-    cssstyle "^1.0.0"
-    data-urls "^1.0.0"
-    domexception "^1.0.1"
-    escodegen "^1.9.1"
-    html-encoding-sniffer "^1.0.2"
-    left-pad "^1.3.0"
-    nwsapi "^2.0.7"
-    parse5 "4.0.0"
-    pn "^1.1.0"
-    request "^2.87.0"
-    request-promise-native "^1.0.5"
-    sax "^1.2.4"
-    symbol-tree "^3.2.2"
-    tough-cookie "^2.3.4"
-    w3c-hr-time "^1.0.1"
-    webidl-conversions "^4.0.2"
-    whatwg-encoding "^1.0.3"
-    whatwg-mimetype "^2.1.0"
-    whatwg-url "^6.4.1"
-    ws "^5.2.0"
+jsdom@^16.2.2:
+  version "16.2.2"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b"
+  integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==
+  dependencies:
+    abab "^2.0.3"
+    acorn "^7.1.1"
+    acorn-globals "^6.0.0"
+    cssom "^0.4.4"
+    cssstyle "^2.2.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.0"
+    domexception "^2.0.1"
+    escodegen "^1.14.1"
+    html-encoding-sniffer "^2.0.1"
+    is-potential-custom-element-name "^1.0.0"
+    nwsapi "^2.2.0"
+    parse5 "5.1.1"
+    request "^2.88.2"
+    request-promise-native "^1.0.8"
+    saxes "^5.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^3.0.1"
+    w3c-hr-time "^1.0.2"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^6.0.0"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
+    ws "^7.2.3"
     xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
@@ -2361,6 +2738,13 @@ json5@^2.1.0:
   dependencies:
     minimist "^1.2.5"
 
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  dependencies:
+    minimist "^1.2.5"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -2479,11 +2863,6 @@ lcov-parse@^1.0.0:
   resolved "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
   integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=
 
-left-pad@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
-  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
-
 less-plugin-inline-urls@^1.1.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/less-plugin-inline-urls/-/less-plugin-inline-urls-1.2.0.tgz#5ddab07a0c2571f1a2855cf929ddc9efc1e38acc"
@@ -2529,6 +2908,11 @@ line-json@^2.0.0:
   resolved "https://registry.npmjs.org/line-json/-/line-json-2.0.0.tgz#9236a5403ceb92d8659b73dfee3f3d229eab518d"
   integrity sha1-kjalQDzrkthlm3Pf7j89Ip6rUY0=
 
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
 linkify-it@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
@@ -2536,16 +2920,6 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -2554,13 +2928,12 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
+    p-locate "^4.1.0"
 
 lodash.clone@^4.5.0:
   version "4.5.0"
@@ -2587,20 +2960,12 @@ longest@^1.0.1:
   resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
   integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
+    semver "^6.0.0"
 
 makeerror@1.0.x:
   version "1.0.11"
@@ -2663,7 +3028,7 @@ merge@^1.2.0:
   resolved "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
   integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
-micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -2682,6 +3047,14 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 mime-db@1.43.0:
   version "1.43.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
@@ -2699,7 +3072,7 @@ mime@^1.2.11:
   resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mimic-fn@^2.0.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -2746,11 +3119,6 @@ ms@^2.1.1:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-nan@^2.12.1:
-  version "2.14.0"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -2788,20 +3156,21 @@ node-modules-regexp@^1.0.0:
   resolved "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
-node-notifier@^5.4.2:
-  version "5.4.3"
-  resolved "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
-  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
+node-notifier@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.0.tgz#513bc42f2aa3a49fce1980a7ff375957c71f718a"
+  integrity sha512-y8ThJESxsHcak81PGpzWwQKxzk+5YtP3IxR8AYdpXQ1IB6FmcVzFdZXrkPin49F/DKUCfeeiziB8ptY9npzGuA==
   dependencies:
     growly "^1.3.0"
-    is-wsl "^1.1.0"
-    semver "^5.5.0"
+    is-wsl "^2.1.1"
+    semver "^7.2.1"
     shellwords "^0.1.1"
-    which "^1.3.0"
+    uuid "^7.0.3"
+    which "^2.0.2"
 
-normalize-package-data@^2.3.2:
+normalize-package-data@^2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -2816,6 +3185,11 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -2823,14 +3197,21 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nwsapi@^2.0.7:
+nwsapi@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
 oauth-sign@~0.8.1:
@@ -2843,7 +3224,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.1:
+object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -2857,16 +3238,6 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
-
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -2874,24 +3245,6 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.getownpropertydescriptors@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
-  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -2906,6 +3259,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -2932,12 +3292,10 @@ p-defer@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
-p-each-series@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
-  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
-  dependencies:
-    p-reduce "^1.0.0"
+p-each-series@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
+  integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==
 
 p-finally@^1.0.0:
   version "1.0.0"
@@ -2956,10 +3314,10 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
-  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
@@ -2970,17 +3328,12 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
-    p-limit "^2.0.0"
-
-p-reduce@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
-  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
+    p-limit "^2.2.0"
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -2992,18 +3345,20 @@ p-try@^2.0.0:
   resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+parse-json@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f"
+  integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==
   dependencies:
+    "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
+    lines-and-columns "^1.1.6"
 
-parse5@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+parse5@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
 
 pascalcase@^0.1.1:
   version "0.1.1"
@@ -3015,6 +3370,11 @@ path-exists@^3.0.0:
   resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3025,18 +3385,16 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
@@ -3047,15 +3405,10 @@ performance-now@^2.1.0:
   resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+picomatch@^2.0.4, picomatch@^2.0.5:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
 pirates@^4.0.1:
   version "4.0.1"
@@ -3064,17 +3417,12 @@ pirates@^4.0.1:
   dependencies:
     node-modules-regexp "^1.0.0"
 
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
-    find-up "^3.0.0"
-
-pn@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
-  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+    find-up "^4.0.0"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -3091,15 +3439,15 @@ prettier@1.19.1:
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
-  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
+pretty-format@^26.0.1:
+  version "26.0.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.0.1.tgz#a4fe54fe428ad2fd3413ca6bbd1ec8c2e277e197"
+  integrity sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==
   dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
+    "@jest/types" "^26.0.1"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -3173,27 +3521,29 @@ qs@~6.5.2:
   resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-react-is@^16.8.4:
-  version "16.13.0"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
-  integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
+react-is@^16.12.0:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
 
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
 
 readable-stream@^2.2.2:
   version "2.3.7"
@@ -3208,13 +3558,6 @@ readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-realpath-native@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
-  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
-  dependencies:
-    util.promisify "^1.0.0"
-
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -3250,9 +3593,9 @@ request-promise-core@1.1.3:
   dependencies:
     lodash "^4.17.15"
 
-request-promise-native@^1.0.5:
+request-promise-native@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
   integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
     request-promise-core "1.1.3"
@@ -3287,7 +3630,7 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.87.0, request@^2.88.0:
+request@^2.88.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -3328,28 +3671,23 @@ require-main-filename@^2.0.0:
   resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
   dependencies:
-    resolve-from "^3.0.0"
+    resolve-from "^5.0.0"
 
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.1.7, resolve@~1.1.6:
-  version "1.1.7"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-
 resolve@^1.10.0, resolve@^1.15.1, resolve@^1.3.2:
   version "1.15.1"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
@@ -3357,6 +3695,18 @@ resolve@^1.10.0, resolve@^1.15.1, resolve@^1.3.2:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@~1.1.6:
+  version "1.1.7"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -3369,14 +3719,14 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3:
+rimraf@2:
   version "2.7.1"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -3430,21 +3780,28 @@ sax@0.5.x:
   resolved "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
   integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
 
-sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+saxes@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+  dependencies:
+    xmlchars "^2.2.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.2.0:
+semver@^6.0.0, semver@^6.3.0:
   version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.2.1, semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -3467,11 +3824,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -3487,10 +3856,10 @@ sisteransi@^1.0.4:
   resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
   integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -3570,6 +3939,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 spdx-correct@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -3630,10 +4004,12 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-stack-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
-  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
+stack-utils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz#5cf48b4557becb4638d0bc4f21d23f5d19586593"
+  integrity sha512-0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg==
+  dependencies:
+    escape-string-regexp "^2.0.0"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -3648,13 +4024,13 @@ stealthy-require@^1.1.1:
   resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-string-length@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
-  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
+string-length@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
+  integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==
   dependencies:
-    astral-regex "^1.0.0"
-    strip-ansi "^4.0.0"
+    char-regex "^1.0.2"
+    strip-ansi "^6.0.0"
 
 string-width@^1.0.1:
   version "1.0.2"
@@ -3673,30 +4049,14 @@ string-width@^2.0.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string.prototype.trimleft@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
-  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
-string.prototype.trimright@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
-  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
   dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
@@ -3724,23 +4084,28 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
   dependencies:
-    ansi-regex "^4.1.0"
+    ansi-regex "^5.0.0"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
 stylus@~0.54.5:
   version "0.54.5"
   resolved "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
@@ -3760,16 +4125,24 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
-symbol-tree@^3.2.2:
+supports-hyperlinks@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
+  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
+
+symbol-tree@^3.2.4:
   version "3.2.4"
-  resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tar@^1.0.3:
@@ -3781,21 +4154,33 @@ tar@^1.0.3:
     fstream "^1.0.2"
     inherits "2"
 
-test-exclude@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
-  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
+terminal-link@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
+  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    supports-hyperlinks "^2.0.0"
+
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
-    glob "^7.1.3"
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
     minimatch "^3.0.4"
-    read-pkg-up "^4.0.0"
-    require-main-filename "^2.0.0"
 
 throat@^4.0.0, throat@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
+throat@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
+  integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
+
 through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -3831,6 +4216,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -3846,7 +4238,7 @@ token-stream@1.0.0:
   resolved "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
   integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=
 
-tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0:
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -3854,6 +4246,15 @@ tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
+tough-cookie@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+  dependencies:
+    ip-regex "^2.1.0"
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tough-cookie@~2.3.0:
   version "2.3.4"
   resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
@@ -3861,12 +4262,12 @@ tough-cookie@~2.3.0:
   dependencies:
     punycode "^1.4.1"
 
-tr46@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
-  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+tr46@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
+  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
   dependencies:
-    punycode "^2.1.0"
+    punycode "^2.1.1"
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
@@ -3887,6 +4288,33 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -3961,21 +4389,25 @@ util-deprecate@~1.0.1:
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
-  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.2"
-    has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.0"
-
 uuid@^3.0.0, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
+  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
+
+v8-to-istanbul@^4.1.3:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz#b97936f21c0e2d9996d4985e5c5156e9d4e49cd6"
+  integrity sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+    source-map "^0.7.3"
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -3998,13 +4430,20 @@ void-elements@^3.1.0:
   resolved "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
   integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
 
-w3c-hr-time@^1.0.1:
+w3c-hr-time@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
   integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
     browser-process-hrtime "^1.0.0"
 
+w3c-xmlserializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+  dependencies:
+    xml-name-validator "^3.0.0"
+
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
@@ -4012,53 +4451,56 @@ walker@^1.0.7, walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
+webidl-conversions@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
+whatwg-encoding@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
   integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
+whatwg-mimetype@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@^6.4.1:
-  version "6.5.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
-  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
-whatwg-url@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
-  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+whatwg-url@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz#c628acdcf45b82274ce7281ee31dd3c839791771"
+  integrity sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==
   dependencies:
     lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
+    tr46 "^2.0.2"
+    webidl-conversions "^5.0.0"
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.9, which@^1.3.0:
+which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
@@ -4092,35 +4534,34 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
   dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
 
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
-  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
-    graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
     signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
 
-ws@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^7.2.3:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
+  integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
 
 wsrun@^5.2.0:
   version "5.2.0"
@@ -4142,6 +4583,11 @@ xml-name-validator@^3.0.0:
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
@@ -4152,10 +4598,10 @@ y18n@^4.0.0:
   resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+yargs-parser@^18.1.1:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -4185,21 +4631,22 @@ yargs@^11.1.1:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^13.3.0:
-  version "13.3.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+yargs@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
   dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
     get-caller-file "^2.0.1"
     require-directory "^2.1.1"
     require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^3.0.0"
+    string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^13.1.2"
+    yargs-parser "^18.1.1"
 
 yargs@~3.10.0:
   version "3.10.0"

From 8288ec5fa9b28781be78ea4508b3f8c9ca7f9ba1 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Sun, 24 May 2020 11:53:46 +0100
Subject: [PATCH 90/96] ci: fix some problems with the workflows and add
 dry-run (#3254)

---
 .github/workflows/rollingversions-dry-run.yml | 21 ++++++++++++++++
 .github/workflows/rollingversions.yml         | 10 +++++---
 .github/workflows/test.yml                    |  2 +-
 README.md                                     | 24 +++++++++----------
 package.json                                  |  4 +++-
 5 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 .github/workflows/rollingversions-dry-run.yml

diff --git a/.github/workflows/rollingversions-dry-run.yml b/.github/workflows/rollingversions-dry-run.yml
new file mode 100644
index 000000000..752b0b6f1
--- /dev/null
+++ b/.github/workflows/rollingversions-dry-run.yml
@@ -0,0 +1,21 @@
+name: Publish Dry Run
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish-dry-run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+          registry-url: 'https://registry.npmjs.org'
+      - run: yarn install --frozen-lockfile
+      - run: npx rollingversions publish --dry-run
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/rollingversions.yml b/.github/workflows/rollingversions.yml
index fe688f79d..7144b1c8a 100644
--- a/.github/workflows/rollingversions.yml
+++ b/.github/workflows/rollingversions.yml
@@ -17,17 +17,21 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn install --forzen-lockfile
+      - run: yarn install --frozen-lockfile
       - run: yarn prettier:check
       - run: yarn test
 
   publish:
     runs-on: ubuntu-latest
+    needs: test
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
           node-version: 12.x
-      - run: yarn install --forzen-lockfile
-      - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
+          registry-url: 'https://registry.npmjs.org'
+      - run: yarn install --frozen-lockfile
       - run: npx rollingversions publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0dcf9c96a..396e1a0bd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,6 +22,6 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn install --forzen-lockfile
+      - run: yarn install --frozen-lockfile
       - run: yarn prettier:check
       - run: yarn test
diff --git a/README.md b/README.md
index 779295b31..9465b9eef 100644
--- a/README.md
+++ b/README.md
@@ -3,21 +3,19 @@
 
 Full documentation is at [pugjs.org](https://pugjs.org/)
 
- Pug is a high-performance template engine heavily influenced by [Haml](http://haml.info/)
- and implemented with JavaScript for [Node.js](http://nodejs.org) and browsers. For bug reports,
- feature requests and questions, [open an issue](https://github.com/pugjs/pug/issues/new).
- For discussion join the [chat room](https://gitter.im/pugjs/pug).
+Pug is a high-performance template engine heavily influenced by [Haml](http://haml.info/)
+and implemented with JavaScript for [Node.js](http://nodejs.org) and browsers. For bug reports,
+feature requests and questions, [open an issue](https://github.com/pugjs/pug/issues/new).
+For discussion join the [chat room](https://gitter.im/pugjs/pug).
 
- You can test drive Pug online [here](https://pugjs.org/).
+You can test drive Pug online [here](https://pugjs.org/).
  
- [Professionally supported pug is now available](https://tidelift.com/subscription/pkg/npm-pug?utm_source=npm-pug&utm_medium=referral&utm_campaign=readme)
-
- [![Build Status](https://img.shields.io/travis/pugjs/pug/master.svg?style=flat)](https://travis-ci.org/pugjs/pug)
- [![Coverage Status](https://img.shields.io/coveralls/pugjs/pug/master.svg?style=flat)](https://coveralls.io/r/pugjs/pug?branch=master)
- [![NPM version](https://img.shields.io/npm/v/pug.svg?style=flat)](https://www.npmjs.com/package/pug)
- [![Join Gitter Chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/pugjs/pug?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![OpenCollective](https://opencollective.com/pug/backers/badge.svg)](#backers) 
-[![OpenCollective](https://opencollective.com/pug/sponsors/badge.svg)](#sponsors)
+[Professionally supported pug is now available](https://tidelift.com/subscription/pkg/npm-pug?utm_source=npm-pug&utm_medium=referral&utm_campaign=readme)
+
+[![Build Status](https://img.shields.io/github/workflow/status/pugjs/pug/Test/master?style=for-the-badge)](https://github.com/pugjs/pug/actions?query=workflow%3ATest+branch%3Amaster)
+[![Rolling Versions](https://img.shields.io/badge/Rolling%20Versions-Enabled-brightgreen?style=for-the-badge)](https://rollingversions.com/YOUR_GITHUB_LOGIN/YOUR_REPOSITORY_NAME)
+[![NPM version](https://img.shields.io/npm/v/pug?style=for-the-badge)](https://www.npmjs.com/package/pug)
+[![Join Gitter Chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg?style=for-the-badge)](https://gitter.im/pugjs/pug?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ### Dependency Status
 
diff --git a/package.json b/package.json
index c2deaae5b..ba40c0720 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "pug-monorepo",
   "private": true,
+  "@rollingversions/ignore": true,
   "workspaces": [
     "packages/*"
   ],
@@ -16,7 +17,8 @@
   "scripts": {
     "prettier:check": "prettier --ignore-path .gitignore --list-different './**/*.js'",
     "format": "prettier --ignore-path .gitignore --write './**/*.js'",
-    "pretest": "wsrun --stages --exclude-missing --fast-exit --collect-logs build",
+    "build": "wsrun --stages --exclude-missing --fast-exit --collect-logs build",
+    "pretest": "yarn build",
     "test": "jest",
     "coverage": "jest --coverage",
     "coveralls": "jest --coverage --coverageReporters=text-lcov | coveralls",

From 24a7b8eaaf86e53d0581c9e7900fb8fa906c5b2a Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Sun, 24 May 2020 20:38:39 +0100
Subject: [PATCH 91/96] chore: remove get-repo dependency (#3256)

---
 packages/pug-filters/package.json             |    1 -
 .../pug-filters/test/update-test-cases.js     |  186 ---
 packages/pug-parser/package.json              |    4 +-
 packages/pug-parser/test/index.test.js        |    1 -
 yarn.lock                                     | 1209 +++++++----------
 5 files changed, 493 insertions(+), 908 deletions(-)
 delete mode 100644 packages/pug-filters/test/update-test-cases.js

diff --git a/packages/pug-filters/package.json b/packages/pug-filters/package.json
index 3d5dea9e5..f54578341 100644
--- a/packages/pug-filters/package.json
+++ b/packages/pug-filters/package.json
@@ -13,7 +13,6 @@
     "resolve": "^1.15.1"
   },
   "devDependencies": {
-    "get-repo": "^1.0.0",
     "jstransformer-cdata": "^1.0.0",
     "jstransformer-coffee-script": "^1.1.1",
     "jstransformer-less": "^2.3.0",
diff --git a/packages/pug-filters/test/update-test-cases.js b/packages/pug-filters/test/update-test-cases.js
deleted file mode 100644
index 6e90996fb..000000000
--- a/packages/pug-filters/test/update-test-cases.js
+++ /dev/null
@@ -1,186 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-var assert = require('assert');
-var getRepo = require('get-repo');
-var lex = require('pug-lexer');
-var load = require('pug-load');
-var parse = require('pug-parser');
-var handleFilters = require('../').handleFilters;
-var customFilters = require('./custom-filters.js');
-
-var existing = fs.readdirSync(__dirname + '/cases').filter(function(name) {
-  return /\.input\.json$/.test(name);
-});
-
-function getError(input, filename) {
-  try {
-    handleFilters(input, customFilters);
-    throw new Error('Expected ' + filename + ' to throw an exception.');
-  } catch (ex) {
-    if (!ex || !ex.code || ex.code.indexOf('PUG:') !== 0) throw ex;
-    return {
-      msg: ex.msg,
-      code: ex.code,
-      line: ex.line,
-    };
-  }
-}
-
-getRepo('pugjs', 'pug-parser')
-  .on('data', function(entry) {
-    var match;
-    if (
-      entry.type === 'File' &&
-      (match = /^\/test\/cases\/(filters.*)\.expected\.json$/.exec(entry.path))
-    ) {
-      var name = match[1];
-      var filename = name + '.input.json';
-      var alreadyExists = false;
-      existing = existing.filter(function(existingName) {
-        if (existingName === filename) {
-          alreadyExists = true;
-          return false;
-        }
-        return true;
-      });
-      if (alreadyExists) {
-        var actualInputAst = getLoadedAst(entry.body.toString('utf8'));
-        try {
-          var expectedInputAst = JSON.parse(
-            fs.readFileSync(__dirname + '/cases/' + filename, 'utf8')
-          );
-          assert.deepEqual(expectedInputAst, actualInputAst);
-        } catch (ex) {
-          console.log('update: ' + filename);
-          fs.writeFileSync(
-            __dirname + '/cases/' + filename,
-            JSON.stringify(actualInputAst, null, '  ')
-          );
-        }
-
-        var actualAstStr = JSON.stringify(
-          handleFilters(actualInputAst, customFilters),
-          null,
-          '  '
-        );
-        try {
-          var expectedAstStr = fs.readFileSync(
-            __dirname + '/cases/' + name + '.expected.json',
-            'utf8'
-          );
-          assert.equal(actualAstStr, expectedAstStr);
-        } catch (ex) {
-          console.log('update: ' + name + '.expected.json');
-          fs.writeFileSync(
-            __dirname + '/cases/' + name + '.expected.json',
-            actualAstStr
-          );
-        }
-      } else {
-        console.log('create: ' + filename);
-        var inputAst = getLoadedAst(entry.body.toString('utf8'));
-        fs.writeFileSync(
-          __dirname + '/cases/' + filename,
-          JSON.stringify(inputAst, null, '  ')
-        );
-        console.log('create: ' + name + '.expected.json');
-        var ast = handleFilters(inputAst, customFilters);
-        fs.writeFileSync(
-          __dirname + '/cases/' + name + '.expected.json',
-          JSON.stringify(ast, null, '  ')
-        );
-      }
-    }
-  })
-  .on('end', function() {
-    existing.forEach(function(file) {
-      fs.unlinkSync(__dirname + '/cases/' + file);
-    });
-    var existingErrors = fs
-      .readdirSync(__dirname + '/errors')
-      .filter(function(name) {
-        return /\.input\.json$/.test(name);
-      });
-    var pugRe = /\.pug$/;
-    fs.readdirSync(__dirname + '/errors-src').forEach(function(name) {
-      if (!pugRe.test(name)) return;
-      name = name.replace(pugRe, '');
-      var filename = name + '.input.json';
-      var alreadyExists = false;
-      existingErrors = existingErrors.filter(function(existingName) {
-        if (existingName === filename) {
-          alreadyExists = true;
-          return false;
-        }
-        return true;
-      });
-      if (alreadyExists) {
-        var actualTokens = parse(
-          lex(
-            fs.readFileSync(__dirname + '/errors-src/' + name + '.pug', 'utf8')
-          )
-        );
-        try {
-          var expectedTokens = JSON.parse(
-            fs.readFileSync(__dirname + '/errors/' + filename, 'utf8')
-          );
-          assert.deepEqual(actualTokens, expectedTokens);
-        } catch (ex) {
-          console.log('update: ' + filename);
-          fs.writeFileSync(
-            __dirname + '/errors/' + filename,
-            JSON.stringify(actualTokens, null, '  ')
-          );
-        }
-        var actual = getError(actualTokens, filename);
-        try {
-          var expected = JSON.parse(
-            fs.readFileSync(
-              __dirname + '/errors/' + name + '.expected.json',
-              'utf8'
-            )
-          );
-          assert.deepEqual(actual, expected);
-        } catch (ex) {
-          console.log('update: ' + name + '.expected.json');
-          fs.writeFileSync(
-            __dirname + '/errors/' + name + '.expected.json',
-            JSON.stringify(actual, null, '  ')
-          );
-        }
-      } else {
-        console.log('create: ' + filename);
-        var ast = parse(
-          lex(
-            fs.readFileSync(__dirname + '/errors-src/' + name + '.pug', 'utf8')
-          )
-        );
-        fs.writeFileSync(
-          __dirname + '/errors/' + filename,
-          JSON.stringify(ast, null, 2)
-        );
-        console.log('create: ' + name + '.expected.json');
-        var actual = getError(ast, filename);
-        fs.writeFileSync(
-          __dirname + '/errors/' + name + '.expected.json',
-          JSON.stringify(actual, null, '  ')
-        );
-      }
-    });
-    console.log('test cases updated');
-  });
-
-function getLoadedAst(str) {
-  return load(JSON.parse(str), {
-    lex: function() {
-      throw new Error('The lexer should not be used');
-    },
-    parse: function() {
-      throw new Error('The parser should not be used');
-    },
-    resolve: function(filename, source, options) {
-      return 'test/cases/' + filename.trim();
-    },
-  });
-}
diff --git a/packages/pug-parser/package.json b/packages/pug-parser/package.json
index 3873172a9..d391e22d5 100644
--- a/packages/pug-parser/package.json
+++ b/packages/pug-parser/package.json
@@ -9,9 +9,7 @@
     "pug-error": "^1.3.3",
     "token-stream": "1.0.0"
   },
-  "devDependencies": {
-    "get-repo": "^1.0.0"
-  },
+  "devDependencies": {},
   "files": [
     "lib/inline-tags.js",
     "index.js"
diff --git a/packages/pug-parser/test/index.test.js b/packages/pug-parser/test/index.test.js
index c0b9721d1..006d3c94a 100644
--- a/packages/pug-parser/test/index.test.js
+++ b/packages/pug-parser/test/index.test.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var fs = require('fs');
-var getRepo = require('get-repo');
 var parse = require('../');
 
 var testCases = fs.readdirSync(__dirname + '/cases').filter(function(name) {
diff --git a/yarn.lock b/yarn.lock
index 187e19487..13a4b6123 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4,33 +4,12 @@
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
   integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/core@^7.1.0":
-  version "7.8.7"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
-  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.7"
-    "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.7"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.7"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.7.5":
+"@babel/core@^7.1.0", "@babel/core@^7.7.5":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
   integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
@@ -52,16 +31,6 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.8.6", "@babel/generator@^7.8.7":
-  version "7.8.8"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e"
-  integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==
-  dependencies:
-    "@babel/types" "^7.8.7"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
@@ -72,15 +41,6 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-function-name@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
@@ -92,7 +52,7 @@
 
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
   integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
   dependencies:
     "@babel/types" "^7.8.3"
@@ -133,7 +93,7 @@
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
 "@babel/helper-replace-supers@^7.8.6":
@@ -156,25 +116,16 @@
 
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
   integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-validator-identifier@^7.9.5":
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
   integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
 
-"@babel/helpers@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
-  integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.4"
-    "@babel/types" "^7.8.3"
-
 "@babel/helpers@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
@@ -185,20 +136,15 @@
     "@babel/types" "^7.9.6"
 
 "@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
+  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
   dependencies:
+    "@babel/helper-validator-identifier" "^7.9.0"
     chalk "^2.0.0"
-    esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.6.0", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7":
-  version "7.8.8"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4"
-  integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==
-
-"@babel/parser@^7.9.6":
+"@babel/parser@^7.1.0", "@babel/parser@^7.6.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
   integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
@@ -275,29 +221,14 @@
 
 "@babel/template@^7.3.3", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
   integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
   dependencies:
     "@babel/code-frame" "^7.8.3"
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff"
-  integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.6"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.9.6":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
   integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
@@ -312,16 +243,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.6.1", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
-  integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.3.3", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.6.1", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
   integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
@@ -337,19 +259,20 @@
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
-  resolved "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
   integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
   dependencies:
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
 "@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
-  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
     find-up "^4.1.0"
+    get-package-type "^0.1.0"
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
@@ -516,7 +439,7 @@
 
 "@jest/types@^24.9.0":
   version "24.9.0"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
   integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
@@ -534,9 +457,9 @@
     chalk "^4.0.0"
 
 "@sinonjs/commons@^1.7.0":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
-  integrity sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
+  integrity sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==
   dependencies:
     type-detect "4.0.8"
 
@@ -560,23 +483,23 @@
 
 "@types/babel__generator@*":
   version "7.6.1"
-  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04"
   integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
   version "7.0.2"
-  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
   integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.9"
-  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz#be82fab304b141c3eee81a4ce3b034d0eba1590a"
-  integrity sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz#1ae3010e8bf8851d324878b42acec71986486d18"
+  integrity sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -592,35 +515,30 @@
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
-  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
-
-"@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"
   integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==
 
 "@types/istanbul-lib-report@*":
   version "3.0.0"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
   integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
+  integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
 "@types/node@*":
-  version "14.0.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.3.tgz#57bcb277f753a3dabfa56cea0a93288aae82143c"
-  integrity sha512-a8TR2N5VEJCL9HEJrAfwv3UI1bZq50HydowDDVV6pfnY7ZwG5Pjii+nSDhrDtGW3XKMoVKOgG8zS/Kv5j399uA==
+  version "14.0.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.5.tgz#3d03acd3b3414cf67faf999aed11682ed121f22b"
+  integrity sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -628,24 +546,24 @@
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
 "@types/prettier@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.0.tgz#dc85454b953178cc6043df5208b9e949b54a3bc4"
-  integrity sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.1.tgz#b6e98083f13faa1e5231bfa3bdb1b0feff536b6d"
+  integrity sha512-boy4xPNEtiw6N3abRhBi/e7hNvy3Tt8E9ZRAQrwAGzoCGZS/1wjo9KY7JHhnfnEsG5wSjDbymCozUM9a3ea7OQ==
 
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
 "@types/yargs-parser@*":
   version "15.0.0"
-  resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
 "@types/yargs@^13.0.0":
-  version "13.0.8"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99"
-  integrity sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==
+  version "13.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1"
+  integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -671,26 +589,26 @@ acorn-globals@^6.0.0:
 
 acorn-walk@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
   integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
 
 acorn@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
-  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
+  integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
 
 ajv@^4.9.1:
   version "4.11.8"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
 ajv@^6.5.5:
-  version "6.12.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -699,18 +617,13 @@ ajv@^6.5.5:
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
   integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
   dependencies:
     kind-of "^3.0.2"
     longest "^1.0.1"
     repeat-string "^1.5.2"
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-escapes@^4.2.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
@@ -725,7 +638,7 @@ ansi-regex@^2.0.0:
 
 ansi-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-regex@^5.0.0:
@@ -735,7 +648,7 @@ ansi-regex@^5.0.0:
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
@@ -750,7 +663,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
 
 anymatch@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
   integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
@@ -766,92 +679,87 @@ anymatch@^3.0.3:
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-unique@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-asap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz#b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"
-  integrity sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0=
-
 asap@~2.0.3:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 asn1@~0.2.3:
   version "0.2.4"
-  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
   integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
   integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
 
 assign-symbols@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 async@~0.2.6:
   version "0.2.10"
-  resolved "https://registry.npmjs.org/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
   integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 aws-sign2@~0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
   integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
-  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.2.1, aws4@^1.8.0:
-  version "1.9.1"
-  resolved "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
-  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
+  integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
 babel-jest@^26.0.1:
   version "26.0.1"
@@ -913,7 +821,7 @@ babel-preset-jest@^26.0.0:
 
 babel-runtime@^6.11.6, babel-runtime@^6.26.0:
   version "6.26.0"
-  resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
@@ -921,7 +829,7 @@ babel-runtime@^6.11.6, babel-runtime@^6.26.0:
 
 babel-types@^6.15.0:
   version "6.26.0"
-  resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
@@ -931,7 +839,7 @@ babel-types@^6.15.0:
 
 babylon-walk@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/babylon-walk/-/babylon-walk-1.0.2.tgz#3b15a5ddbb482a78b4ce9c01c8ba181702d9d6ce"
+  resolved "https://registry.yarnpkg.com/babylon-walk/-/babylon-walk-1.0.2.tgz#3b15a5ddbb482a78b4ce9c01c8ba181702d9d6ce"
   integrity sha1-OxWl3btIKni0zpwByLoYFwLZ1s4=
   dependencies:
     babel-runtime "^6.11.6"
@@ -940,24 +848,17 @@ babylon-walk@^1.0.2:
 
 babylon@^6.9.1:
   version "6.18.0"
-  resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 balanced-match@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-barrage@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/barrage/-/barrage-1.1.0.tgz#6f5384765c463f7718012f160dccf033fc6fc394"
-  integrity sha1-b1OEdlxGP3cYAS8WDczwM/xvw5Q=
-  dependencies:
-    promise "^6.0.0"
-
 base@^0.11.1:
   version "0.11.2"
-  resolved "https://registry.npmjs.org/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
   integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
@@ -970,18 +871,11 @@ base@^0.11.1:
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
   integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
 bluebird@^3.5.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -989,14 +883,14 @@ bluebird@^3.5.1:
 
 boom@2.x.x:
   version "2.10.1"
-  resolved "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
   integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -1004,7 +898,7 @@ brace-expansion@^1.1.7:
 
 braces@^2.3.1:
   version "2.3.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
@@ -1027,24 +921,24 @@ braces@^3.0.1:
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 bser@2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
   integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
 buffer-from@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 cache-base@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
   integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
@@ -1059,12 +953,12 @@ cache-base@^1.0.1:
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase@^1.0.2:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
 camelcase@^4.1.0:
@@ -1074,7 +968,7 @@ camelcase@^4.1.0:
 
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.0.0:
@@ -1084,19 +978,19 @@ camelcase@^6.0.0:
 
 capture-exit@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
   integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
   dependencies:
     rsvp "^4.8.4"
 
 caseless@~0.12.0:
   version "0.12.0"
-  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 center-align@^0.1.1:
   version "0.1.3"
-  resolved "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
   integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
   dependencies:
     align-text "^0.1.3"
@@ -1104,7 +998,7 @@ center-align@^0.1.1:
 
 chalk@^2.0.0, chalk@^2.3.0:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -1126,19 +1020,19 @@ char-regex@^1.0.2:
 
 character-parser@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
   integrity sha1-x84o821LzZdE5f/CxfzeHHMmH8A=
   dependencies:
     is-regex "^1.0.3"
 
 ci-info@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 class-utils@^0.3.5:
   version "0.3.6"
-  resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
   integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
@@ -1148,7 +1042,7 @@ class-utils@^0.3.5:
 
 cliui@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
   integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
   dependencies:
     center-align "^0.1.1"
@@ -1175,12 +1069,12 @@ cliui@^6.0.0:
 
 clone@^2.0.0:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
@@ -1190,7 +1084,7 @@ code-point-at@^1.0.0:
 
 coffee-script@~1.12.7:
   version "1.12.7"
-  resolved "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
   integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
 
 collect-v8-coverage@^1.0.0:
@@ -1200,7 +1094,7 @@ collect-v8-coverage@^1.0.0:
 
 collection-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
   integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
@@ -1208,7 +1102,7 @@ collection-visit@^1.0.0:
 
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
@@ -1222,7 +1116,7 @@ color-convert@^2.0.1:
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-name@~1.1.4:
@@ -1232,34 +1126,24 @@ color-name@~1.1.4:
 
 combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
 component-emitter@^1.2.1:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.4.6, concat-stream@^1.4.7:
-  version "1.6.2"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
 constantinople@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151"
   integrity sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==
   dependencies:
     "@babel/parser" "^7.6.0"
@@ -1267,29 +1151,29 @@ constantinople@^4.0.1:
 
 convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js@^2.4.0:
   version "2.6.11"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 coveralls@3.0.9:
   version "3.0.9"
-  resolved "https://registry.npmjs.org/coveralls/-/coveralls-3.0.9.tgz#8cfc5a5525f84884e2948a0bf0f1c0e90aac0420"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.9.tgz#8cfc5a5525f84884e2948a0bf0f1c0e90aac0420"
   integrity sha512-nNBg3B1+4iDox5A5zqHKzUTiwl2ey4k2o0NEcVZYvl+GOSJdKBj4AJGKLv6h3SvWch7tABHePAQOSZWM9E2hMg==
   dependencies:
     js-yaml "^3.13.1"
@@ -1300,7 +1184,7 @@ coveralls@3.0.9:
 
 cross-spawn@^6.0.0:
   version "6.0.5"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
@@ -1320,15 +1204,27 @@ cross-spawn@^7.0.0:
 
 cryptiles@2.x.x:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
   integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
-css-parse@1.7.x:
-  version "1.7.0"
-  resolved "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
+css-parse@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
+  integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=
+  dependencies:
+    css "^2.0.0"
+
+css@^2.0.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
+  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
+  dependencies:
+    inherits "^2.0.3"
+    source-map "^0.6.1"
+    source-map-resolve "^0.5.2"
+    urix "^0.1.0"
 
 cssom@^0.4.4:
   version "0.4.4"
@@ -1349,7 +1245,7 @@ cssstyle@^2.2.0:
 
 dashdash@^1.12.0:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
   integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
@@ -1363,23 +1259,30 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-debug@*, debug@^4.1.0, debug@^4.1.1:
+debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
-debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decimal.js@^10.2.0:
@@ -1389,12 +1292,12 @@ decimal.js@^10.2.0:
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 deep-is@~0.1.3:
   version "0.1.3"
-  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 deepmerge@^4.2.2:
@@ -1404,21 +1307,21 @@ deepmerge@^4.2.2:
 
 define-property@^0.2.5:
   version "0.2.5"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
   integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
   integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
   integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
@@ -1426,7 +1329,7 @@ define-property@^2.0.2:
 
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 detect-newline@^3.0.0:
@@ -1441,7 +1344,7 @@ diff-sequences@^26.0.0:
 
 doctypes@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
   integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=
 
 domexception@^2.0.1:
@@ -1453,7 +1356,7 @@ domexception@^2.0.1:
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
   integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
@@ -1466,33 +1369,33 @@ emoji-regex@^8.0.0:
 
 end-of-stream@^1.1.0:
   version "1.4.4"
-  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 entities@~1.1.1:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 errno@^0.1.1:
   version "0.1.7"
-  resolved "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escape-string-regexp@^2.0.0:
@@ -1514,27 +1417,27 @@ escodegen@^1.14.1:
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 estraverse@^4.2.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 exec-sh@^0.3.2:
   version "0.3.4"
-  resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
   integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
 execa@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
   integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
     cross-spawn "^6.0.0"
@@ -1546,9 +1449,9 @@ execa@^1.0.0:
     strip-eof "^1.0.0"
 
 execa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.1.tgz#988488781f1f0238cd156f7aaede11c3e853b4c1"
-  integrity sha512-SCjM/zlBdOK8Q5TIjOn6iEHZaPHFsMoTxXQ2nvUvtPnuohz3H2dIozSg+etNR98dGoYUp2ENSKLL/XaMmbxVgw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.2.tgz#ad87fb7b2d9d564f70d2b62d511bee41d5cbb240"
+  integrity sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"
@@ -1562,12 +1465,12 @@ execa@^4.0.0:
 
 exit@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^2.1.4:
   version "2.1.4"
-  resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
   integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
@@ -1592,14 +1495,14 @@ expect@^26.0.1:
 
 extend-shallow@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
   integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
   integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
@@ -1607,12 +1510,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 
 extend@~3.0.0, extend@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 extglob@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
   integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
@@ -1626,39 +1529,39 @@ extglob@^2.0.4:
 
 extsprintf@1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
   integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 fast-deep-equal@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@~2.0.6:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fb-watchman@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
   integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
   dependencies:
     bser "2.1.1"
 
 fill-range@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
   integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
@@ -1690,17 +1593,17 @@ find-up@^4.0.0, find-up@^4.1.0:
 
 for-in@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 forever-agent@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.1.1:
   version "2.1.4"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
   integrity sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=
   dependencies:
     asynckit "^0.4.0"
@@ -1709,7 +1612,7 @@ form-data@~2.1.1:
 
 form-data@~2.3.2:
   version "2.3.3"
-  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
@@ -1718,14 +1621,14 @@ form-data@~2.3.2:
 
 fragment-cache@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
   integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^2.1.2:
@@ -1733,24 +1636,14 @@ fsevents@^2.1.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
-fstream@^1.0.2:
-  version "1.0.12"
-  resolved "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
-  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
   integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
 
 get-caller-file@^1.0.1:
@@ -1760,23 +1653,17 @@ get-caller-file@^1.0.1:
 
 get-caller-file@^2.0.1:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-repo@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/get-repo/-/get-repo-1.0.0.tgz#b14624bba917b677397d00feed98dd316a21b140"
-  integrity sha1-sUYku6kXtnc5fQD+7ZjdMWohsUA=
-  dependencies:
-    barrage "^1.1.0"
-    concat-stream "^1.4.7"
-    http-basic "^1.1.0"
-    promise "^6.0.1"
-    tar "^1.0.3"
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
 get-stream@^4.0.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
@@ -1790,31 +1677,19 @@ get-stream@^5.0.0:
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
-  resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
   integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
-glob@7.0.x:
-  version "7.0.6"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.6"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
@@ -1826,37 +1701,32 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
 
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-graceful-fs@^4.1.2:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
-
-graceful-fs@^4.2.4:
+graceful-fs@^4.1.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
 growly@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 har-schema@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
   integrity sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=
 
 har-schema@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~4.2.1:
   version "4.2.1"
-  resolved "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
   integrity sha1-M0gdDxu/9gDdID11gSpqX7oALio=
   dependencies:
     ajv "^4.9.1"
@@ -1864,7 +1734,7 @@ har-validator@~4.2.1:
 
 har-validator@~5.1.3:
   version "5.1.3"
-  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
     ajv "^6.5.5"
@@ -1872,7 +1742,7 @@ har-validator@~5.1.3:
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-flag@^4.0.0:
@@ -1882,7 +1752,7 @@ has-flag@^4.0.0:
 
 has-value@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
   integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
@@ -1891,7 +1761,7 @@ has-value@^0.3.1:
 
 has-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
   integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
@@ -1900,12 +1770,12 @@ has-value@^1.0.0:
 
 has-values@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
   integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
   integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
@@ -1913,14 +1783,14 @@ has-values@^1.0.0:
 
 has@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hawk@~3.1.3:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
@@ -1930,12 +1800,12 @@ hawk@~3.1.3:
 
 hoek@2.x.x:
   version "2.16.3"
-  resolved "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
   integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
 hosted-git-info@^2.1.4:
   version "2.8.8"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
 html-encoding-sniffer@^2.0.1:
@@ -1946,26 +1816,13 @@ html-encoding-sniffer@^2.0.1:
     whatwg-encoding "^1.0.5"
 
 html-escaper@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
-  integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
-
-http-basic@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/http-basic/-/http-basic-1.1.1.tgz#caf71e9f7d54eebee550eec9b6351d0c68a9b886"
-  integrity sha1-yvcen31U7r7lUO7JtjUdDGipuIY=
-  dependencies:
-    concat-stream "^1.4.6"
-    http-response-object "^1.0.0"
-
-http-response-object@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/http-response-object/-/http-response-object-1.1.0.tgz#a7c4e75aae82f3bb4904e4f43f615673b4d518c3"
-  integrity sha1-p8TnWq6C87tJBOT0P2FWc7TVGMM=
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 http-signature@~1.1.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
   integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
@@ -1974,7 +1831,7 @@ http-signature@~1.1.0:
 
 http-signature@~1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
   integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
@@ -1988,14 +1845,14 @@ human-signals@^1.1.1:
 
 iconv-lite@0.4.24:
   version "0.4.24"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 image-size@~0.5.0:
   version "0.5.5"
-  resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 import-local@^3.0.2:
@@ -2008,20 +1865,20 @@ import-local@^3.0.2:
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 invert-kv@^2.0.0:
@@ -2036,52 +1893,52 @@ ip-regex@^2.1.0:
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
   integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
   integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-buffer@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-ci@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
   integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
     ci-info "^2.0.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
   integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
   integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
   integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
@@ -2090,7 +1947,7 @@ is-descriptor@^0.1.0:
 
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
   integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
@@ -2112,12 +1969,12 @@ is-expression@^4.0.0:
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
   integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
@@ -2131,7 +1988,7 @@ is-fullwidth-code-point@^1.0.0:
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-fullwidth-code-point@^3.0.0:
@@ -2141,12 +1998,12 @@ is-fullwidth-code-point@^3.0.0:
 
 is-generator-fn@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-number@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
   integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
@@ -2158,7 +2015,7 @@ is-number@^7.0.0:
 
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
@@ -2169,20 +2026,20 @@ is-potential-custom-element-name@^1.0.0:
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
 is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
 is-regex@^1.0.3:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
   integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
   dependencies:
     has "^1.0.3"
 
 is-stream@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-stream@^2.0.0:
@@ -2192,12 +2049,12 @@ is-stream@^2.0.0:
 
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-windows@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^2.1.1:
@@ -2207,31 +2064,31 @@ is-wsl@^2.1.1:
   dependencies:
     is-docker "^2.0.0"
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
   integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-lib-coverage@^3.0.0:
@@ -2277,7 +2134,7 @@ istanbul-reports@^3.0.2:
 
 jest-changed-files@^24.9.0:
   version "24.9.0"
-  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
   integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==
   dependencies:
     "@jest/types" "^24.9.0"
@@ -2476,7 +2333,7 @@ jest-mock@^26.0.1:
 
 jest-pnp-resolver@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
   integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
 
 jest-regex-util@^26.0.0:
@@ -2646,25 +2503,25 @@ jest@^26.0.1:
 
 js-stringify@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
   integrity sha1-Fzb939lyTyijaCrcYjCufk6Weds=
 
 js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
 jsbn@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsdom@^16.2.2:
@@ -2701,43 +2558,36 @@ jsdom@^16.2.2:
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
-  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stable-stringify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   integrity sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=
   dependencies:
     jsonify "~0.0.0"
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
-  dependencies:
-    minimist "^1.2.5"
-
 json5@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
@@ -2747,12 +2597,12 @@ json5@^2.1.2:
 
 jsonify@~0.0.0:
   version "0.0.0"
-  resolved "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsprim@^1.2.2:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
   integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
@@ -2762,12 +2612,12 @@ jsprim@^1.2.2:
 
 jstransformer-cdata@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/jstransformer-cdata/-/jstransformer-cdata-1.0.0.tgz#3c15f0696478d39a4564a33010094b90b7ee9fb6"
+  resolved "https://registry.yarnpkg.com/jstransformer-cdata/-/jstransformer-cdata-1.0.0.tgz#3c15f0696478d39a4564a33010094b90b7ee9fb6"
   integrity sha1-PBXwaWR405pFZKMwEAlLkLfun7Y=
 
 jstransformer-coffee-script@^1.0.0, jstransformer-coffee-script@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/jstransformer-coffee-script/-/jstransformer-coffee-script-1.1.1.tgz#6455eb2f8b26fdff2abeb1b3c9875e6b1f4f8fa6"
+  resolved "https://registry.yarnpkg.com/jstransformer-coffee-script/-/jstransformer-coffee-script-1.1.1.tgz#6455eb2f8b26fdff2abeb1b3c9875e6b1f4f8fa6"
   integrity sha1-ZFXrL4sm/f8qvrGzyYdeax9Pj6Y=
   dependencies:
     coffee-script "~1.12.7"
@@ -2775,7 +2625,7 @@ jstransformer-coffee-script@^1.0.0, jstransformer-coffee-script@^1.1.1:
 
 jstransformer-less@^2.1.0, jstransformer-less@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/jstransformer-less/-/jstransformer-less-2.3.0.tgz#ac3a2f8ad688d73179495bbab85c7216ad5608eb"
+  resolved "https://registry.yarnpkg.com/jstransformer-less/-/jstransformer-less-2.3.0.tgz#ac3a2f8ad688d73179495bbab85c7216ad5608eb"
   integrity sha1-rDovitaI1zF5SVu6uFxyFq1WCOs=
   dependencies:
     less "^2.3.1"
@@ -2783,15 +2633,15 @@ jstransformer-less@^2.1.0, jstransformer-less@^2.3.0:
     less-plugin-npm-import "^2.0.0"
 
 jstransformer-markdown-it@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/jstransformer-markdown-it/-/jstransformer-markdown-it-2.0.0.tgz#8b44aedbc9465dc935d280be90339b671c16ceb8"
-  integrity sha1-i0Su28lGXck10oC+kDObZxwWzrg=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/jstransformer-markdown-it/-/jstransformer-markdown-it-2.1.0.tgz#69ec30ce4518bed5997b38f027648e8c285e92f7"
+  integrity sha1-aewwzkUYvtWZezjwJ2SOjChekvc=
   dependencies:
     markdown-it "^8.0.0"
 
 jstransformer-stylus@^1.0.0, jstransformer-stylus@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.npmjs.org/jstransformer-stylus/-/jstransformer-stylus-1.5.0.tgz#9e65a9225eda4bd586c5da69d3d3d8661018ebf7"
+  resolved "https://registry.yarnpkg.com/jstransformer-stylus/-/jstransformer-stylus-1.5.0.tgz#9e65a9225eda4bd586c5da69d3d3d8661018ebf7"
   integrity sha1-nmWpIl7aS9WGxdpp09PYZhAY6/c=
   dependencies:
     clone "^2.0.0"
@@ -2799,19 +2649,19 @@ jstransformer-stylus@^1.0.0, jstransformer-stylus@^1.5.0:
 
 jstransformer-uglify-js@^1.1.1, jstransformer-uglify-js@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/jstransformer-uglify-js/-/jstransformer-uglify-js-1.2.0.tgz#f26b5fb2a99bb0f5354f884cb50b5914bc5224a8"
+  resolved "https://registry.yarnpkg.com/jstransformer-uglify-js/-/jstransformer-uglify-js-1.2.0.tgz#f26b5fb2a99bb0f5354f884cb50b5914bc5224a8"
   integrity sha1-8mtfsqmbsPU1T4hMtQtZFLxSJKg=
   dependencies:
     uglify-js "^2.8.10"
 
 jstransformer-verbatim@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/jstransformer-verbatim/-/jstransformer-verbatim-1.1.1.tgz#8cda3f804146ac5f0f70bcc5b60a0cc79f8c4d94"
+  resolved "https://registry.yarnpkg.com/jstransformer-verbatim/-/jstransformer-verbatim-1.1.1.tgz#8cda3f804146ac5f0f70bcc5b60a0cc79f8c4d94"
   integrity sha1-jNo/gEFGrF8PcLzFtgoMx5+MTZQ=
 
 jstransformer@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
   integrity sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=
   dependencies:
     is-promise "^2.0.0"
@@ -2819,36 +2669,36 @@ jstransformer@1.0.0:
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
   integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 lazy-cache@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
   integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
 lcid@^2.0.0:
@@ -2860,17 +2710,17 @@ lcid@^2.0.0:
 
 lcov-parse@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
+  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
   integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=
 
 less-plugin-inline-urls@^1.1.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/less-plugin-inline-urls/-/less-plugin-inline-urls-1.2.0.tgz#5ddab07a0c2571f1a2855cf929ddc9efc1e38acc"
+  resolved "https://registry.yarnpkg.com/less-plugin-inline-urls/-/less-plugin-inline-urls-1.2.0.tgz#5ddab07a0c2571f1a2855cf929ddc9efc1e38acc"
   integrity sha1-XdqwegwlcfGihVz5Kd3J78Hjisw=
 
 less-plugin-npm-import@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
   integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
   dependencies:
     promise "~7.0.1"
@@ -2878,7 +2728,7 @@ less-plugin-npm-import@^2.0.0:
 
 less@^2.3.1:
   version "2.7.3"
-  resolved "https://registry.npmjs.org/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
+  resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
   integrity sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==
   optionalDependencies:
     errno "^0.1.1"
@@ -2892,12 +2742,12 @@ less@^2.3.1:
 
 leven@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 levn@~0.3.0:
   version "0.3.0"
-  resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
@@ -2905,7 +2755,7 @@ levn@~0.3.0:
 
 line-json@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/line-json/-/line-json-2.0.0.tgz#9236a5403ceb92d8659b73dfee3f3d229eab518d"
+  resolved "https://registry.yarnpkg.com/line-json/-/line-json-2.0.0.tgz#9236a5403ceb92d8659b73dfee3f3d229eab518d"
   integrity sha1-kjalQDzrkthlm3Pf7j89Ip6rUY0=
 
 lines-and-columns@^1.1.6:
@@ -2915,7 +2765,7 @@ lines-and-columns@^1.1.6:
 
 linkify-it@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
   integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
   dependencies:
     uc.micro "^1.0.1"
@@ -2937,27 +2787,27 @@ locate-path@^5.0.0:
 
 lodash.clone@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
   integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
-  resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4:
   version "4.17.15"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
 log-driver@^1.2.7:
   version "1.2.7"
-  resolved "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
+  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
   integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
 
 longest@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
   integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
 make-dir@^3.0.0:
@@ -2969,7 +2819,7 @@ make-dir@^3.0.0:
 
 makeerror@1.0.x:
   version "1.0.11"
-  resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
   integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
   dependencies:
     tmpl "1.0.x"
@@ -2983,19 +2833,19 @@ map-age-cleaner@^0.1.1:
 
 map-cache@^0.2.2:
   version "0.2.2"
-  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
   integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 markdown-it@^8.0.0:
   version "8.4.2"
-  resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
   integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
   dependencies:
     argparse "^1.0.7"
@@ -3006,7 +2856,7 @@ markdown-it@^8.0.0:
 
 mdurl@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
 mem@^4.0.0:
@@ -3020,17 +2870,17 @@ mem@^4.0.0:
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge@^1.2.0:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
   integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
 micromatch@^3.1.4:
   version "3.1.10"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
@@ -3055,21 +2905,21 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.0.5"
 
-mime-db@1.43.0:
-  version "1.43.0"
-  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
-  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+mime-db@1.44.0:
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
 mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.7:
-  version "2.1.26"
-  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
-  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
+  version "2.1.27"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
   dependencies:
-    mime-db "1.43.0"
+    mime-db "1.44.0"
 
 mime@^1.2.11:
   version "1.6.0"
-  resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mimic-fn@^2.0.0, mimic-fn@^2.1.0:
@@ -3077,51 +2927,46 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 mixin-deep@^1.2.0:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
   integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.x:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
-    minimist "0.0.8"
+    minimist "^1.2.5"
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 nanomatch@^1.2.9:
   version "1.2.13"
-  resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
   integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
@@ -3138,28 +2983,28 @@ nanomatch@^1.2.9:
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nice-try@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-int64@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-modules-regexp@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
 node-notifier@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.0.tgz#513bc42f2aa3a49fce1980a7ff375957c71f718a"
-  integrity sha512-y8ThJESxsHcak81PGpzWwQKxzk+5YtP3IxR8AYdpXQ1IB6FmcVzFdZXrkPin49F/DKUCfeeiziB8ptY9npzGuA==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.1.tgz#a355e33e6bebacef9bf8562689aed0f4230ca6f9"
+  integrity sha512-VkzhierE7DBmQEElhTGJIoiZa1oqRijOtgOlsXg32KrJRXsPy0NXFBqWGW/wTswnJlDCs5viRYaqWguqzsKcmg==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.1.1"
@@ -3180,7 +3025,7 @@ normalize-package-data@^2.5.0:
 
 normalize-path@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
@@ -3192,7 +3037,7 @@ normalize-path@^3.0.0:
 
 npm-run-path@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
@@ -3216,22 +3061,22 @@ nwsapi@^2.2.0:
 
 oauth-sign@~0.8.1:
   version "0.8.2"
-  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
   integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
-  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-copy@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
   integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
@@ -3240,21 +3085,21 @@ object-copy@^0.1.0:
 
 object-visit@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
   integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.pick@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
@@ -3268,7 +3113,7 @@ onetime@^5.1.0:
 
 optionator@^0.8.1:
   version "0.8.3"
-  resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
@@ -3299,7 +3144,7 @@ p-each-series@^2.1.0:
 
 p-finally@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^2.0.0:
@@ -3342,7 +3187,7 @@ p-try@^1.0.0:
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parse-json@^5.0.0:
@@ -3362,12 +3207,12 @@ parse5@5.1.1:
 
 pascalcase@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-exists@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-exists@^4.0.0:
@@ -3377,12 +3222,12 @@ path-exists@^4.0.0:
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-key@^3.0.0, path-key@^3.1.0:
@@ -3392,17 +3237,17 @@ path-key@^3.0.0, path-key@^3.1.0:
 
 path-parse@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 performance-now@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
   integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
 
 performance-now@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 picomatch@^2.0.4, picomatch@^2.0.5:
@@ -3412,7 +3257,7 @@ picomatch@^2.0.4, picomatch@^2.0.5:
 
 pirates@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
   dependencies:
     node-modules-regexp "^1.0.0"
@@ -3426,17 +3271,17 @@ pkg-dir@^4.2.0:
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 prelude-ls@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prettier@1.19.1:
   version "1.19.1"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 pretty-format@^26.0.1:
@@ -3449,53 +3294,41 @@ pretty-format@^26.0.1:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-promise@^6.0.0, promise@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
-  integrity sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY=
-  dependencies:
-    asap "~1.0.0"
-
 promise@^7.0.1, promise@^7.1.1:
   version "7.3.1"
-  resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
 promise@~7.0.1:
   version "7.0.4"
-  resolved "https://registry.npmjs.org/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
   integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
   dependencies:
     asap "~2.0.3"
 
 prompts@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05"
-  integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"
+  integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==
   dependencies:
     kleur "^3.0.3"
     sisteransi "^1.0.4"
 
 prr@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 psl@^1.1.28:
-  version "1.7.0"
-  resolved "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
-  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
 pump@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
   integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
@@ -3503,22 +3336,22 @@ pump@^3.0.0:
 
 punycode@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@~6.4.0:
   version "6.4.0"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
   integrity sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=
 
 qs@~6.5.2:
   version "6.5.2"
-  resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 react-is@^16.12.0:
@@ -3545,27 +3378,14 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 regenerator-runtime@^0.11.0:
   version "0.11.1"
-  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
@@ -3573,22 +3393,22 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
-  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 request-promise-core@1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
   integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
     lodash "^4.17.15"
@@ -3604,7 +3424,7 @@ request-promise-native@^1.0.8:
 
 request@2.81.0:
   version "2.81.0"
-  resolved "https://registry.npmjs.org/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   integrity sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=
   dependencies:
     aws-sign2 "~0.6.0"
@@ -3632,7 +3452,7 @@ request@2.81.0:
 
 request@^2.88.0, request@^2.88.2:
   version "2.88.2"
-  resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
@@ -3658,7 +3478,7 @@ request@^2.88.0, request@^2.88.2:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-main-filename@^1.0.1:
@@ -3668,7 +3488,7 @@ require-main-filename@^1.0.1:
 
 require-main-filename@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
 resolve-cwd@^3.0.0:
@@ -3685,17 +3505,10 @@ resolve-from@^5.0.0:
 
 resolve-url@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.15.1, resolve@^1.3.2:
-  version "1.15.1"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.17.0:
+resolve@^1.10.0, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.3.2:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -3704,65 +3517,58 @@ resolve@^1.17.0:
 
 resolve@~1.1.6:
   version "1.1.7"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
 ret@~0.1.10:
   version "0.1.15"
-  resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 right-align@^0.1.1:
   version "0.1.3"
-  resolved "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
   integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2:
-  version "2.7.1"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
 rsvp@^4.8.4:
   version "4.8.5"
-  resolved "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
   integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sane@^4.0.3:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
   integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
   dependencies:
     "@cnakazawa/watch" "^1.0.3"
@@ -3775,10 +3581,10 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
+sax@~1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 saxes@^5.0.0:
   version "5.0.1"
@@ -3789,7 +3595,7 @@ saxes@^5.0.0:
 
 "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0:
   version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@^6.0.0, semver@^6.3.0:
@@ -3804,12 +3610,12 @@ semver@^7.2.1, semver@^7.3.2:
 
 set-blocking@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
   integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
@@ -3819,7 +3625,7 @@ set-value@^2.0.0, set-value@^2.0.1:
 
 shebang-command@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
   integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
@@ -3833,7 +3639,7 @@ shebang-command@^2.0.0:
 
 shebang-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shebang-regex@^3.0.0:
@@ -3843,18 +3649,18 @@ shebang-regex@^3.0.0:
 
 shellwords@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
 sisteransi@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
-  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
 slash@^3.0.0:
   version "3.0.0"
@@ -3863,7 +3669,7 @@ slash@^3.0.0:
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
   integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
@@ -3872,14 +3678,14 @@ snapdragon-node@^2.0.1:
 
 snapdragon-util@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
   integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
-  resolved "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
   integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
@@ -3893,14 +3699,14 @@ snapdragon@^0.8.1:
 
 sntp@1.x.x:
   version "1.0.9"
-  resolved "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
   integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
-source-map-resolve@^0.5.0:
+source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
-  resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
   integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
     atob "^2.1.2"
@@ -3910,33 +3716,26 @@ source-map-resolve@^0.5.0:
     urix "^0.1.0"
 
 source-map-support@^0.5.6:
-  version "0.5.16"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@0.1.x:
-  version "0.1.43"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
   version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@^0.7.3:
@@ -3945,34 +3744,34 @@ source-map@^0.7.3:
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
 spdx-correct@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
-  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
-  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
   version "3.0.5"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
   integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
@@ -3986,12 +3785,12 @@ split@^1.0.1:
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.16.1"
-  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
   integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
   dependencies:
     asn1 "~0.2.3"
@@ -4013,7 +3812,7 @@ stack-utils@^2.0.2:
 
 static-extend@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
   integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
@@ -4021,7 +3820,7 @@ static-extend@^0.1.1:
 
 stealthy-require@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 string-length@^4.0.1:
@@ -4058,16 +3857,9 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringstream@~0.0.4:
   version "0.0.6"
-  resolved "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
   integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
@@ -4079,7 +3871,7 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
 
 strip-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
   integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
@@ -4098,7 +3890,7 @@ strip-bom@^4.0.0:
 
 strip-eof@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-final-newline@^2.0.0:
@@ -4107,20 +3899,22 @@ strip-final-newline@^2.0.0:
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 stylus@~0.54.5:
-  version "0.54.5"
-  resolved "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
-  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
+  version "0.54.7"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.7.tgz#c6ce4793965ee538bcebe50f31537bfc04d88cd2"
+  integrity sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==
   dependencies:
-    css-parse "1.7.x"
-    debug "*"
-    glob "7.0.x"
-    mkdirp "0.5.x"
-    sax "0.5.x"
-    source-map "0.1.x"
+    css-parse "~2.0.0"
+    debug "~3.1.0"
+    glob "^7.1.3"
+    mkdirp "~0.5.x"
+    safer-buffer "^2.1.2"
+    sax "~1.2.4"
+    semver "^6.0.0"
+    source-map "^0.7.3"
 
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
@@ -4145,15 +3939,6 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-tar@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz#15bcdab244fa4add44e4244a0176edb8aa9a2b44"
-  integrity sha1-FbzaskT6St1E5CRKAXbtuKqaK0Q=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
 terminal-link@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -4173,7 +3958,7 @@ test-exclude@^6.0.0:
 
 throat@^4.0.0, throat@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
 throat@^5.0.0:
@@ -4188,29 +3973,29 @@ through@2:
 
 tmpl@1.0.x:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
   integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
   integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
   integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
   integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
@@ -4225,7 +4010,7 @@ to-regex-range@^5.0.1:
 
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
   integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
@@ -4235,12 +4020,12 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 
 token-stream@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-1.0.0.tgz#cc200eab2613f4166d27ff9afc7ca56d49df6eb4"
   integrity sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=
 
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
     psl "^1.1.28"
@@ -4257,7 +4042,7 @@ tough-cookie@^3.0.1:
 
 tough-cookie@~2.3.0:
   version "2.3.4"
-  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
   integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
@@ -4271,19 +4056,19 @@ tr46@^2.0.2:
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
-  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
-  resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
   integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
@@ -4315,19 +4100,14 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 uglify-js@^2.6.1, uglify-js@^2.8.10:
   version "2.8.29"
-  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
   dependencies:
     source-map "~0.5.1"
@@ -4346,12 +4126,12 @@ uglify-js@^2.6.1, uglify-js@^2.8.10:
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
   integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
 union-value@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
   integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
@@ -4361,7 +4141,7 @@ union-value@^1.0.0:
 
 unset-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
   integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
@@ -4369,29 +4149,24 @@ unset-value@^1.0.0:
 
 uri-js@^4.2.2:
   version "4.2.2"
-  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
   integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 use@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
 uuid@^3.0.0, uuid@^3.3.2:
   version "3.4.0"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 uuid@^7.0.3:
@@ -4410,7 +4185,7 @@ v8-to-istanbul@^4.1.3:
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -4418,7 +4193,7 @@ validate-npm-package-license@^3.0.1:
 
 verror@1.10.0:
   version "1.10.0"
-  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
   integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
@@ -4427,7 +4202,7 @@ verror@1.10.0:
 
 void-elements@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
   integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
 
 w3c-hr-time@^1.0.2:
@@ -4446,7 +4221,7 @@ w3c-xmlserializer@^2.0.0:
 
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
   dependencies:
     makeerror "1.0.x"
@@ -4484,12 +4259,12 @@ whatwg-url@^8.0.0:
 
 which-module@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@^1.2.9:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
@@ -4503,12 +4278,12 @@ which@^2.0.1, which@^2.0.2:
 
 window-size@0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
   integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
 with@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/with/-/with-6.0.0.tgz#00223660fa0d0aeb4776965e61f902410c4c9d86"
+  resolved "https://registry.yarnpkg.com/with/-/with-6.0.0.tgz#00223660fa0d0aeb4776965e61f902410c4c9d86"
   integrity sha512-FrwIIWGUkHViaUXWmEvcwKy+eI0ajKh/Xq192o2kwFtSI7lS7xE5O1E2VNurhWE9ZLRDwr6GAAkKDsDIyStUuw==
   dependencies:
     babel-runtime "^6.11.6"
@@ -4518,12 +4293,12 @@ with@^6.0.0:
 
 word-wrap@~1.2.3:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
 wordwrap@0.0.2:
   version "0.0.2"
-  resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
 wrap-ansi@^2.0.0:
@@ -4545,7 +4320,7 @@ wrap-ansi@^6.2.0:
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^3.0.0:
@@ -4580,7 +4355,7 @@ wsrun@^5.2.0:
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xmlchars@^2.2.0:
@@ -4595,7 +4370,7 @@ y18n@^3.2.1:
 
 y18n@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yargs-parser@^18.1.1:
@@ -4650,7 +4425,7 @@ yargs@^15.3.1:
 
 yargs@~3.10.0:
   version "3.10.0"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
   integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
   dependencies:
     camelcase "^1.0.2"

From ccba7dae678b1fceaa9b46d9d15a78ee0a2569d4 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 25 May 2020 00:05:48 +0100
Subject: [PATCH 92/96] ci: publish canary release (#3257)

---
 .github/workflows/rollingversions-canary.yml  | 40 +++++++++++++++++++
 .github/workflows/rollingversions-dry-run.yml | 21 ----------
 .github/workflows/rollingversions.yml         |  1 +
 .github/workflows/test.yml                    |  3 --
 4 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/rollingversions-canary.yml
 delete mode 100644 .github/workflows/rollingversions-dry-run.yml

diff --git a/.github/workflows/rollingversions-canary.yml b/.github/workflows/rollingversions-canary.yml
new file mode 100644
index 000000000..3fe8e91b1
--- /dev/null
+++ b/.github/workflows/rollingversions-canary.yml
@@ -0,0 +1,40 @@
+name: Publish Canary
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn install --frozen-lockfile
+      - run: yarn prettier:check
+      - run: yarn test
+
+  publish-canary:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+          registry-url: 'https://registry.npmjs.org'
+      - run: yarn install --frozen-lockfile
+      - run: yarn build
+      - run: npx rollingversions publish --canary $GITHUB_RUN_NUMBER
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/rollingversions-dry-run.yml b/.github/workflows/rollingversions-dry-run.yml
deleted file mode 100644
index 752b0b6f1..000000000
--- a/.github/workflows/rollingversions-dry-run.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Publish Dry Run
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  publish-dry-run:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-          registry-url: 'https://registry.npmjs.org'
-      - run: yarn install --frozen-lockfile
-      - run: npx rollingversions publish --dry-run
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/rollingversions.yml b/.github/workflows/rollingversions.yml
index 7144b1c8a..441206aa5 100644
--- a/.github/workflows/rollingversions.yml
+++ b/.github/workflows/rollingversions.yml
@@ -31,6 +31,7 @@ jobs:
           node-version: 12.x
           registry-url: 'https://registry.npmjs.org'
       - run: yarn install --frozen-lockfile
+      - run: yarn build
       - run: npx rollingversions publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 396e1a0bd..4903918c2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,9 +1,6 @@
 name: Test
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
     branches:
       - master

From c077df4a8d523fe42e52f83b62d3c8ba3822d3b3 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 25 May 2020 13:16:42 +0100
Subject: [PATCH 93/96] docs: fix rolling versions link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9465b9eef..e15419e34 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ You can test drive Pug online [here](https://pugjs.org/).
 [Professionally supported pug is now available](https://tidelift.com/subscription/pkg/npm-pug?utm_source=npm-pug&utm_medium=referral&utm_campaign=readme)
 
 [![Build Status](https://img.shields.io/github/workflow/status/pugjs/pug/Test/master?style=for-the-badge)](https://github.com/pugjs/pug/actions?query=workflow%3ATest+branch%3Amaster)
-[![Rolling Versions](https://img.shields.io/badge/Rolling%20Versions-Enabled-brightgreen?style=for-the-badge)](https://rollingversions.com/YOUR_GITHUB_LOGIN/YOUR_REPOSITORY_NAME)
+[![Rolling Versions](https://img.shields.io/badge/Rolling%20Versions-Enabled-brightgreen?style=for-the-badge)](https://rollingversions.com/pugjs/pug)
 [![NPM version](https://img.shields.io/npm/v/pug?style=for-the-badge)](https://www.npmjs.com/package/pug)
 [![Join Gitter Chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg?style=for-the-badge)](https://gitter.im/pugjs/pug?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

From 13e46e9fe87220530a066d3aae49131969920275 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 25 May 2020 23:37:30 +0100
Subject: [PATCH 94/96] chore: update with (#3259)

closes #3239
---
 packages/pug-code-gen/package.json |  2 +-
 yarn.lock                          | 76 +++++++-----------------------
 2 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/packages/pug-code-gen/package.json b/packages/pug-code-gen/package.json
index 42507a6eb..e0f3d9991 100644
--- a/packages/pug-code-gen/package.json
+++ b/packages/pug-code-gen/package.json
@@ -13,7 +13,7 @@
     "pug-error": "^1.3.3",
     "pug-runtime": "^2.0.5",
     "void-elements": "^3.1.0",
-    "with": "^6.0.0"
+    "with": "^7.0.0"
   },
   "files": [
     "index.js"
diff --git a/yarn.lock b/yarn.lock
index 13a4b6123..40f4bc82d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -716,6 +716,11 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -819,37 +824,12 @@ babel-preset-jest@^26.0.0:
     babel-plugin-jest-hoist "^26.0.0"
     babel-preset-current-node-syntax "^0.1.2"
 
-babel-runtime@^6.11.6, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-babel-types@^6.15.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babylon-walk@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/babylon-walk/-/babylon-walk-1.0.2.tgz#3b15a5ddbb482a78b4ce9c01c8ba181702d9d6ce"
-  integrity sha1-OxWl3btIKni0zpwByLoYFwLZ1s4=
+babel-walk@3.0.0-canary-5:
+  version "3.0.0-canary-5"
+  resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11"
+  integrity sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==
   dependencies:
-    babel-runtime "^6.11.6"
-    babel-types "^6.15.0"
-    lodash.clone "^4.5.0"
-
-babylon@^6.9.1:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+    "@babel/types" "^7.9.6"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -1161,11 +1141,6 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js@^2.4.0:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
-
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -2785,11 +2760,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash.clone@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
-  integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -3378,11 +3348,6 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -3976,11 +3941,6 @@ tmpl@1.0.x:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
   integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -4281,15 +4241,15 @@ window-size@0.1.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
   integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
-with@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/with/-/with-6.0.0.tgz#00223660fa0d0aeb4776965e61f902410c4c9d86"
-  integrity sha512-FrwIIWGUkHViaUXWmEvcwKy+eI0ajKh/Xq192o2kwFtSI7lS7xE5O1E2VNurhWE9ZLRDwr6GAAkKDsDIyStUuw==
+with@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/with/-/with-7.0.0.tgz#60b88622fb56482a5ba7fa8ebe1a880d7b64a6e3"
+  integrity sha512-XS51xsYITl5V0q0AcZG/lMPFBbCETHLjL7Tr6ZOmPGP3UkKBmwOKqLgAmenC5v8MHDcOudpNkO1CW0kpe7Oyag==
   dependencies:
-    babel-runtime "^6.11.6"
-    babel-types "^6.15.0"
-    babylon "^6.9.1"
-    babylon-walk "^1.0.2"
+    "@babel/parser" "^7.9.6"
+    "@babel/types" "^7.9.6"
+    assert-never "^1.2.1"
+    babel-walk "3.0.0-canary-5"
 
 word-wrap@~1.2.3:
   version "1.2.3"

From 06baa525a23049756de9587461d389a12bc12537 Mon Sep 17 00:00:00 2001
From: Shinigami <chrissi92@hotmail.de>
Date: Wed, 27 May 2020 17:20:19 +0200
Subject: [PATCH 95/96] Fix TypeScript and add eachOf token definition (#3262)

---
 packages/pug-lexer/index.d.ts   | 700 +++++++++++++++++---------------
 packages/pug-lexer/package.json |   3 +-
 2 files changed, 366 insertions(+), 337 deletions(-)

diff --git a/packages/pug-lexer/index.d.ts b/packages/pug-lexer/index.d.ts
index a5c3addf4..9a8c1261e 100644
--- a/packages/pug-lexer/index.d.ts
+++ b/packages/pug-lexer/index.d.ts
@@ -1,338 +1,366 @@
 declare module 'pug-lexer' {
-	namespace lex {
-		export interface Loc {
-			start: { line: number; column: number };
-			end: { line: number; column: number };
-		}
-
-		export type LexTokenType =
-			| ':'
-			| '&attributes'
-			| 'attribute'
-			| 'block'
-			| 'blockcode'
-			| 'call'
-			| 'case'
-			| 'class'
-			| 'code'
-			| 'comment'
-			| 'default'
-			| 'doctype'
-			| 'dot'
-			| 'each'
-			| 'else-if'
-			| 'else'
-			| 'end-attributes'
-			| 'end-pipeless-text'
-			| 'end-pug-interpolation'
-			| 'eos'
-			| 'extends'
-			| 'filter'
-			| 'id'
-			| 'if'
-			| 'include'
-			| 'indent'
-			| 'interpolated-code'
-			| 'interpolation'
-			| 'mixin-block'
-			| 'mixin'
-			| 'newline'
-			| 'outdent'
-			| 'path'
-			| 'slash'
-			| 'start-attributes'
-			| 'start-pipeless-text'
-			| 'start-pug-interpolation'
-			| 'tag'
-			| 'text-html'
-			| 'text'
-			| 'when'
-			| 'while'
-			| 'yield';
-
-		export interface LexToken<Type extends LexTokenType> {
-			type: Type;
-			loc: Loc;
-		}
-
-		export interface TagToken extends LexToken<'tag'> {
-			val: string;
-		}
-
-		export type StartAttributesToken = LexToken<'start-attributes'>;
-
-		export interface AttributeToken extends LexToken<'attribute'> {
-			name: string;
-			val: string | boolean;
-			mustEscape: boolean;
-		}
-
-		export type EndAttributesToken = LexToken<'end-attributes'>;
-
-		export interface IndentToken extends LexToken<'indent'> {
-			val: number;
-		}
-
-		export interface ClassToken extends LexToken<'class'> {
-			val: string;
-		}
-
-		export type OutdentToken = LexToken<'outdent'>;
-
-		export type EosToken = LexToken<'eos'>;
-
-		export interface CommentToken extends LexToken<'comment'> {
-			val: string;
-			buffer: boolean;
-		}
-
-		export type NewlineToken = LexToken<'newline'>;
-
-		export interface TextToken extends LexToken<'text'> {
-			val: string;
-		}
-
-		export interface InterpolatedCodeToken extends LexToken<'interpolated-code'> {
-			mustEscape: boolean;
-			buffer: boolean;
-			val: string;
-		}
-
-		export interface CodeToken extends LexToken<'code'> {
-			val: string;
-			mustEscape: boolean;
-			buffer: boolean;
-		}
-
-		export interface IdToken extends LexToken<'id'> {
-			val: string;
-		}
-
-		export type StartPipelessTextToken = LexToken<'start-pipeless-text'>;
-
-		export type EndPipelessTextToken = LexToken<'end-pipeless-text'>;
-
-		export interface DoctypeToken extends LexToken<'doctype'> {
-			val: string;
-		}
-
-		export type DotToken = LexToken<'dot'>;
-
-		export interface BlockToken extends LexToken<'block'> {
-			val: string;
-			mode: 'replace' | 'prepend' | 'append';
-		}
-
-		export type ExtendsToken = LexToken<'extends'>;
-
-		export interface PathToken extends LexToken<'path'> {
-			val: string;
-		}
-
-		export type StartPugInterpolationToken = LexToken<'start-pug-interpolation'>;
-
-		export type EndPugInterpolationToken = LexToken<'end-pug-interpolation'>;
-
-		export interface InterpolationToken extends LexToken<'interpolation'> {
-			val: string;
-		}
-
-		export type IncludeToken = LexToken<'include'>;
-
-		export interface FilterToken extends LexToken<'filter'> {
-			val: string;
-		}
-
-		export interface CallToken extends LexToken<'call'> {
-			val: string;
-			args: string;
-		}
-
-		export interface MixinToken extends LexToken<'mixin'> {
-			val: string;
-			args: string | null;
-		}
-
-		export interface IfToken extends LexToken<'if'> {
-			val: string;
-		}
-
-		export type MixinBlockToken = LexToken<'mixin-block'>;
-
-		export interface ElseToken extends LexToken<'else'> {
-			val: string;
-		}
-
-		export interface AndAttributesToken extends LexToken<'&attributes'> {
-			val: string;
-		}
-
-		export interface TextHtmlToken extends LexToken<'text-html'> {
-			val: string;
-		}
-
-		export interface EachToken extends LexToken<'each'> {
-			val: string;
-			key: string | null;
-			code: string;
-		}
-
-		export interface WhileToken extends LexToken<'while'> {
-			val: string;
-		}
-
-		export interface CaseToken extends LexToken<'case'> {
-			val: string;
-		}
-
-		export interface WhenToken extends LexToken<'when'> {
-			val: string;
-		}
-
-		export type ColonToken = LexToken<':'>;
-
-		export type DefaultToken = LexToken<'default'>;
-
-		export interface ElseIfToken extends LexToken<'else-if'> {
-			val: string;
-		}
-
-		export type BlockcodeToken = LexToken<'blockcode'>;
-
-		export type YieldToken = LexToken<'yield'>;
-
-		export type SlashToken = LexToken<'slash'>;
-
-		export type Token =
-			| AndAttributesToken
-			| AttributeToken
-			| BlockcodeToken
-			| BlockToken
-			| CallToken
-			| CaseToken
-			| ClassToken
-			| CodeToken
-			| ColonToken
-			| CommentToken
-			| DefaultToken
-			| DoctypeToken
-			| DotToken
-			| EachToken
-			| ElseIfToken
-			| ElseToken
-			| EndAttributesToken
-			| EndPipelessTextToken
-			| EndPugInterpolationToken
-			| EosToken
-			| ExtendsToken
-			| FilterToken
-			| IdToken
-			| IfToken
-			| IncludeToken
-			| IndentToken
-			| InterpolatedCodeToken
-			| InterpolationToken
-			| MixinBlockToken
-			| MixinToken
-			| NewlineToken
-			| OutdentToken
-			| PathToken
-			| SlashToken
-			| StartAttributesToken
-			| StartPipelessTextToken
-			| StartPugInterpolationToken
-			| TagToken
-			| TextHtmlToken
-			| TextToken
-			| WhenToken
-			| WhileToken
-			| YieldToken;
-
-		export type LexerFunction = (type: string, exp?: any) => boolean;
-		export interface LexerOptions {
-			filename: string;
-			interpolated?: boolean;
-			startingLine?: number;
-			startingColumn?: number;
-			plugins?: LexerFunction[];
-		}
-		export class Lexer {
-			input: string;
-			originalInput: string;
-			filename?: string;
-			interpolated: boolean;
-			lineno: number;
-			colno: number;
-			plugins: LexerFunction[];
-			indentStack: number[];
-			indentRe: RegExp | null;
-			interpolationAllowed: boolean;
-			whitespaceRe: RegExp;
-			tokens: Token[];
-			ended: boolean;
-			constructor(str: string, options?: LexerOptions);
-			error(code: string, message: string): never;
-			assert(value: any, message: string): void;
-			isExpression(exp: string): boolean;
-			assertExpression(exp: string, noThrow?: boolean): boolean;
-			assertNestingCorrect(exp: string): void;
-			private tok<Type extends LexTokenType>(type: Type, val?: any): LexToken<Type>;
-			private tokEnd<Type extends LexTokenType>(tok: LexToken<Type>): LexToken<Type>;
-			private incrementLine(increment: number): void;
-			private incrementColumn(increment: number): void;
-			private consume(len: number): void;
-			private scan<Type extends LexTokenType>(regexp: RegExp, type: Type): LexToken<Type> | undefined;
-			private scanEndOfLine<Type extends LexTokenType>(regexp: RegExp, type: Type): LexToken<Type> | undefined;
-			private bracketExpression(skip?: number): number;
-			scanIndentation(): RegExpExecArray | null;
-			eos(): true | undefined;
-			blank(): true | undefined;
-			comment(): true | undefined;
-			interpolation(): true | undefined;
-			tag(): true | undefined;
-			filter(): true | undefined;
-			doctype(): true | undefined;
-			id(): true | undefined;
-			className(): true | undefined;
-			endInterpolation(): true | undefined;
-			addText(type: LexTokenType, value: string, prefix?: string, escaped?: number): void;
-			text(): true | undefined;
-			textHtml(): true | undefined;
-			dot(): true | undefined;
-			extends(): true | undefined;
-			prepend(): true | undefined;
-			append(): true | undefined;
-			block(): true | undefined;
-			mixinBlock(): true | undefined;
-			yield(): true | undefined;
-			include(): true | undefined;
-			path(): true | undefined;
-			case(): true | undefined;
-			when(): true | undefined;
-			default(): true | undefined;
-			call(): true | undefined;
-			mixin(): true | undefined;
-			conditional(): true | undefined;
-			while(): true | undefined;
-			each(): true | undefined;
-			eachOf(): true | undefined;
-			code(): true | undefined;
-			blockCode(): true | undefined;
-			attribute(): string;
-			attributeValue(str: string): { val?: string; mustEscape?: boolean; remainingSource: string };
-			attrs(): true | undefined;
-			attributesBlock(): true | undefined;
-			indent(): true | NewlineToken | undefined;
-			pipelessText(indents?: number): boolean | undefined;
-			slash(): true | undefined;
-			colon(): true | undefined;
-			fail(): never;
-			callLexerFunction(func: string): boolean;
-			private advance(): boolean;
-			getTokens(): Token[];
-		}
-	}
-	function lex(str: string, options?: lex.LexerOptions): lex.Token[];
-	export = lex;
+  namespace lex {
+    export interface Loc {
+      start: {line: number; column: number};
+      end: {line: number; column: number};
+    }
+
+    export type LexTokenType =
+      | ':'
+      | '&attributes'
+      | 'attribute'
+      | 'block'
+      | 'blockcode'
+      | 'call'
+      | 'case'
+      | 'class'
+      | 'code'
+      | 'comment'
+      | 'default'
+      | 'doctype'
+      | 'dot'
+      | 'each'
+      | 'eachOf'
+      | 'else-if'
+      | 'else'
+      | 'end-attributes'
+      | 'end-pipeless-text'
+      | 'end-pug-interpolation'
+      | 'eos'
+      | 'extends'
+      | 'filter'
+      | 'id'
+      | 'if'
+      | 'include'
+      | 'indent'
+      | 'interpolated-code'
+      | 'interpolation'
+      | 'mixin-block'
+      | 'mixin'
+      | 'newline'
+      | 'outdent'
+      | 'path'
+      | 'slash'
+      | 'start-attributes'
+      | 'start-pipeless-text'
+      | 'start-pug-interpolation'
+      | 'tag'
+      | 'text-html'
+      | 'text'
+      | 'when'
+      | 'while'
+      | 'yield';
+
+    export interface LexToken<Type extends LexTokenType> {
+      type: Type;
+      loc: Loc;
+    }
+
+    export interface TagToken extends LexToken<'tag'> {
+      val: string;
+    }
+
+    export type StartAttributesToken = LexToken<'start-attributes'>;
+
+    export interface AttributeToken extends LexToken<'attribute'> {
+      name: string;
+      val: string | boolean;
+      mustEscape: boolean;
+    }
+
+    export type EndAttributesToken = LexToken<'end-attributes'>;
+
+    export interface IndentToken extends LexToken<'indent'> {
+      val: number;
+    }
+
+    export interface ClassToken extends LexToken<'class'> {
+      val: string;
+    }
+
+    export type OutdentToken = LexToken<'outdent'>;
+
+    export type EosToken = LexToken<'eos'>;
+
+    export interface CommentToken extends LexToken<'comment'> {
+      val: string;
+      buffer: boolean;
+    }
+
+    export type NewlineToken = LexToken<'newline'>;
+
+    export interface TextToken extends LexToken<'text'> {
+      val: string;
+    }
+
+    export interface InterpolatedCodeToken
+      extends LexToken<'interpolated-code'> {
+      mustEscape: boolean;
+      buffer: boolean;
+      val: string;
+    }
+
+    export interface CodeToken extends LexToken<'code'> {
+      val: string;
+      mustEscape: boolean;
+      buffer: boolean;
+    }
+
+    export interface IdToken extends LexToken<'id'> {
+      val: string;
+    }
+
+    export type StartPipelessTextToken = LexToken<'start-pipeless-text'>;
+
+    export type EndPipelessTextToken = LexToken<'end-pipeless-text'>;
+
+    export interface DoctypeToken extends LexToken<'doctype'> {
+      val: string;
+    }
+
+    export type DotToken = LexToken<'dot'>;
+
+    export interface BlockToken extends LexToken<'block'> {
+      val: string;
+      mode: 'replace' | 'prepend' | 'append';
+    }
+
+    export type ExtendsToken = LexToken<'extends'>;
+
+    export interface PathToken extends LexToken<'path'> {
+      val: string;
+    }
+
+    export type StartPugInterpolationToken = LexToken<
+      'start-pug-interpolation'
+    >;
+
+    export type EndPugInterpolationToken = LexToken<'end-pug-interpolation'>;
+
+    export interface InterpolationToken extends LexToken<'interpolation'> {
+      val: string;
+    }
+
+    export type IncludeToken = LexToken<'include'>;
+
+    export interface FilterToken extends LexToken<'filter'> {
+      val: string;
+    }
+
+    export interface CallToken extends LexToken<'call'> {
+      val: string;
+      args: string;
+    }
+
+    export interface MixinToken extends LexToken<'mixin'> {
+      val: string;
+      args: string | null;
+    }
+
+    export interface IfToken extends LexToken<'if'> {
+      val: string;
+    }
+
+    export type MixinBlockToken = LexToken<'mixin-block'>;
+
+    export interface ElseToken extends LexToken<'else'> {
+      val: string;
+    }
+
+    export interface AndAttributesToken extends LexToken<'&attributes'> {
+      val: string;
+    }
+
+    export interface TextHtmlToken extends LexToken<'text-html'> {
+      val: string;
+    }
+
+    export interface EachToken extends LexToken<'each'> {
+      val: string;
+      key: string | null;
+      code: string;
+    }
+
+    export interface EachOfToken extends LexToken<'eachOf'> {
+      val: string;
+      value: string;
+      code: string;
+    }
+
+    export interface WhileToken extends LexToken<'while'> {
+      val: string;
+    }
+
+    export interface CaseToken extends LexToken<'case'> {
+      val: string;
+    }
+
+    export interface WhenToken extends LexToken<'when'> {
+      val: string;
+    }
+
+    export type ColonToken = LexToken<':'>;
+
+    export type DefaultToken = LexToken<'default'>;
+
+    export interface ElseIfToken extends LexToken<'else-if'> {
+      val: string;
+    }
+
+    export type BlockcodeToken = LexToken<'blockcode'>;
+
+    export type YieldToken = LexToken<'yield'>;
+
+    export type SlashToken = LexToken<'slash'>;
+
+    export type Token =
+      | AndAttributesToken
+      | AttributeToken
+      | BlockcodeToken
+      | BlockToken
+      | CallToken
+      | CaseToken
+      | ClassToken
+      | CodeToken
+      | ColonToken
+      | CommentToken
+      | DefaultToken
+      | DoctypeToken
+      | DotToken
+      | EachToken
+      | EachOfToken
+      | ElseIfToken
+      | ElseToken
+      | EndAttributesToken
+      | EndPipelessTextToken
+      | EndPugInterpolationToken
+      | EosToken
+      | ExtendsToken
+      | FilterToken
+      | IdToken
+      | IfToken
+      | IncludeToken
+      | IndentToken
+      | InterpolatedCodeToken
+      | InterpolationToken
+      | MixinBlockToken
+      | MixinToken
+      | NewlineToken
+      | OutdentToken
+      | PathToken
+      | SlashToken
+      | StartAttributesToken
+      | StartPipelessTextToken
+      | StartPugInterpolationToken
+      | TagToken
+      | TextHtmlToken
+      | TextToken
+      | WhenToken
+      | WhileToken
+      | YieldToken;
+
+    export type LexerFunction = (type: string, exp?: any) => boolean;
+    export interface LexerOptions {
+      filename: string;
+      interpolated?: boolean;
+      startingLine?: number;
+      startingColumn?: number;
+      plugins?: LexerFunction[];
+    }
+    export class Lexer {
+      input: string;
+      originalInput: string;
+      filename?: string;
+      interpolated: boolean;
+      lineno: number;
+      colno: number;
+      plugins: LexerFunction[];
+      indentStack: number[];
+      indentRe: RegExp | null;
+      interpolationAllowed: boolean;
+      whitespaceRe: RegExp;
+      tokens: Token[];
+      ended: boolean;
+      constructor(str: string, options?: LexerOptions);
+      error(code: string, message: string): never;
+      assert(value: any, message: string): void;
+      isExpression(exp: string): boolean;
+      assertExpression(exp: string, noThrow?: boolean): boolean;
+      assertNestingCorrect(exp: string): void;
+      private tok<Type extends LexTokenType>(
+        type: Type,
+        val?: any,
+      ): LexToken<Type>;
+      private tokEnd<Type extends LexTokenType>(
+        tok: LexToken<Type>,
+      ): LexToken<Type>;
+      private incrementLine(increment: number): void;
+      private incrementColumn(increment: number): void;
+      private consume(len: number): void;
+      private scan<Type extends LexTokenType>(
+        regexp: RegExp,
+        type: Type,
+      ): LexToken<Type> | undefined;
+      private scanEndOfLine<Type extends LexTokenType>(
+        regexp: RegExp,
+        type: Type,
+      ): LexToken<Type> | undefined;
+      private bracketExpression(skip?: number): number;
+      scanIndentation(): RegExpExecArray | null;
+      eos(): true | undefined;
+      blank(): true | undefined;
+      comment(): true | undefined;
+      interpolation(): true | undefined;
+      tag(): true | undefined;
+      filter(): true | undefined;
+      doctype(): true | undefined;
+      id(): true | undefined;
+      className(): true | undefined;
+      endInterpolation(): true | undefined;
+      addText(
+        type: LexTokenType,
+        value: string,
+        prefix?: string,
+        escaped?: number,
+      ): void;
+      text(): true | undefined;
+      textHtml(): true | undefined;
+      dot(): true | undefined;
+      extends(): true | undefined;
+      prepend(): true | undefined;
+      append(): true | undefined;
+      block(): true | undefined;
+      mixinBlock(): true | undefined;
+      yield(): true | undefined;
+      include(): true | undefined;
+      path(): true | undefined;
+      case(): true | undefined;
+      when(): true | undefined;
+      default(): true | undefined;
+      call(): true | undefined;
+      mixin(): true | undefined;
+      conditional(): true | undefined;
+      while(): true | undefined;
+      each(): true | undefined;
+      eachOf(): true | undefined;
+      code(): true | undefined;
+      blockCode(): true | undefined;
+      attribute(): string;
+      attributeValue(
+        str: string,
+      ): {val?: string; mustEscape?: boolean; remainingSource: string};
+      attrs(): true | undefined;
+      attributesBlock(): true | undefined;
+      indent(): true | NewlineToken | undefined;
+      pipelessText(indents?: number): boolean | undefined;
+      slash(): true | undefined;
+      colon(): true | undefined;
+      fail(): never;
+      callLexerFunction(func: string): boolean;
+      private advance(): boolean;
+      getTokens(): Token[];
+    }
+  }
+  function lex(str: string, options?: lex.LexerOptions): lex.Token[];
+  export = lex;
 }
-  
diff --git a/packages/pug-lexer/package.json b/packages/pug-lexer/package.json
index f9b41c48f..42b120792 100644
--- a/packages/pug-lexer/package.json
+++ b/packages/pug-lexer/package.json
@@ -15,7 +15,8 @@
     "acorn-walk": "^7.1.1"
   },
   "files": [
-    "index.js"
+    "index.js",
+    "index.d.ts"
   ],
   "repository": {
     "type": "git",

From 991e78f7c4220b2f8da042877c6f0ef5a4683be0 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Sun, 28 Feb 2021 18:21:18 +0000
Subject: [PATCH 96/96] fix: sanitise and escape the `pretty` option (#3314)

---
 packages/pug-code-gen/index.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/pug-code-gen/index.js b/packages/pug-code-gen/index.js
index a75929ce9..de5c70a72 100644
--- a/packages/pug-code-gen/index.js
+++ b/packages/pug-code-gen/index.js
@@ -57,6 +57,11 @@ function Compiler(node, options) {
   if (this.pp && typeof this.pp !== 'string') {
     this.pp = '  ';
   }
+  if (this.pp && !/^\s+$/.test(this.pp)) {
+    throw new Error(
+      'The pretty parameter should either be a boolean or whitespace only string'
+    );
+  }
   this.debug = false !== options.compileDebug;
   this.indents = 0;
   this.parentIndents = 0;
@@ -452,7 +457,9 @@ Compiler.prototype = {
   visitMixinBlock: function(block) {
     if (this.pp)
       this.buf.push(
-        "pug_indent.push('" + Array(this.indents + 1).join(this.pp) + "');"
+        'pug_indent.push(' +
+          stringify(Array(this.indents + 1).join(this.pp)) +
+          ');'
       );
     this.buf.push('block && block();');
     if (this.pp) this.buf.push('pug_indent.pop();');
@@ -504,7 +511,9 @@ Compiler.prototype = {
       this.mixins[key].used = true;
       if (pp)
         this.buf.push(
-          "pug_indent.push('" + Array(this.indents + 1).join(pp) + "');"
+          'pug_indent.push(' +
+            stringify(Array(this.indents + 1).join(pp)) +
+            ');'
         );
       if (block || attrs.length || attrsBlocks.length) {
         this.buf.push(name + '.call({');