From 19891b2df071ea6854fabb8af2221d640702d8bd Mon Sep 17 00:00:00 2001
From: harttle <yangjvn@126.com>
Date: Thu, 16 Aug 2018 23:14:12 +0800
Subject: [PATCH] refactor: es6 building and linting

---
 .babelrc                 |    3 +
 .eslintrc.json           |    6 +-
 .gitignore               |   42 +-
 .travis.yml              |    2 +-
 demo/browser/index.html  |    4 +-
 demo/express/app.js      |   10 +-
 demo/express/index.js    |    2 +-
 demo/nodejs/index.js     |   10 +
 dist/liquid.js           | 2004 ++++++++++++++++++++------------------
 dist/liquid.min.js       |    2 +-
 package.json             |   20 +-
 src/filter.js            |   28 +-
 src/index.js             |   79 +-
 src/lexical.js           |   64 +-
 src/parser.js            |   22 +-
 src/render.js            |    6 +-
 src/scope.js             |   10 +-
 src/syntax.js            |   26 +-
 src/tags/assign.js       |    9 +-
 src/tags/capture.js      |    4 +-
 src/tags/case.js         |   14 +-
 src/tags/comment.js      |    2 +-
 src/tags/cycle.js        |   14 +-
 src/tags/decrement.js    |    2 +-
 src/tags/for.js          |   28 +-
 src/tags/if.js           |   12 +-
 src/tags/layout.js       |    8 +-
 src/tags/raw.js          |    2 +-
 src/tags/tablerow.js     |   31 +-
 src/tags/unless.js       |    8 +-
 src/tokenizer.js         |   24 +-
 src/util/error.js        |   18 +-
 src/util/promise.js      |    6 +-
 src/util/strftime.js     |   54 +-
 src/util/underscore.js   |   19 +-
 src/util/url.js          |   13 +-
 src/whitespace-ctrl.js   |    6 +-
 test/express.js          |   10 +-
 test/filter.js           |   22 +-
 test/filters.js          |   30 +-
 test/index.js            |   14 +-
 test/lexical.js          |   12 +-
 test/options/cache.js    |    2 +-
 test/options/strict.js   |   12 +-
 test/options/trimming.js |   32 +-
 test/parser.js           |   16 +-
 test/scope.js            |   11 +-
 test/syntax.js           |   14 +-
 test/tag.js              |   10 +-
 test/tags/case.js        |   16 +-
 test/tags/comment.js     |   12 +-
 test/tags/cycle.js       |   12 +-
 test/tags/decrement.js   |    6 +-
 test/tags/for.js         |   58 +-
 test/tags/if.js          |   40 +-
 test/tags/include.js     |   12 +-
 test/tags/layout.js      |   18 +-
 test/tags/raw.js         |   10 +-
 test/tags/tablerow.js    |   38 +-
 test/tags/unless.js      |   12 +-
 test/tokenizer.js        |   28 +-
 test/util/assert.js      |    6 +-
 test/util/error.js       |   56 +-
 test/util/promise.js     |   22 +-
 test/util/strftime.js    |   26 +-
 test/util/underscore.js  |   30 +-
 test/util/url.js         |    2 +-
 test/xhr.js              |    8 +-
 68 files changed, 1636 insertions(+), 1575 deletions(-)
 create mode 100644 .babelrc
 create mode 100644 demo/nodejs/index.js

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 000000000..c13c5f627
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/.eslintrc.json b/.eslintrc.json
index 22a7a7348..07c1083b6 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,11 +1,15 @@
 {
   "extends": "standard",
   "env": {
+    "es6": true,
     "browser": true,
     "node": true
   },
   "plugins": [
     "standard",
     "promise"
-  ]
+  ],
+  "rules": {
+    "no-var": 2
+  }
 }
diff --git a/.gitignore b/.gitignore
index 7bd4e7cbc..e7d746e97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,40 +1,14 @@
-# Logs
-logs
+# logs
 *.log
 npm-debug.log*
 
-# Runtime data
-pids
-*.pid
-*.seed
+# tests
+coverage/
+.nyc_output/
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
+# modules
+node_modules/
+dist/
 
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-
-# vim
+# editors
 .*.swp
diff --git a/.travis.yml b/.travis.yml
index e723df420..9e3a0e95c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,4 @@ node_js:
 before_script:
   - npm install -g mocha
 after_script: 
-  - npm run lcov && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
+  - npm run coveralls
diff --git a/demo/browser/index.html b/demo/browser/index.html
index 5d7b69279..d13b55f8b 100644
--- a/demo/browser/index.html
+++ b/demo/browser/index.html
@@ -10,19 +10,17 @@
 <body>
   <script>
     var engine = window.Liquid({
-      // root: './',
       extname: '.html',
       cache: true
     });
     var src = '<h2>Welcome to {{ name | capitalize}}, ' +
-      'access time: {{date|date: "%Y-%m-%d %H:%M:%S"}}</h2>';
+      'access time: {{date|date: "%Y-%m-%d %H:%M:%S"}}&lt;/h2>';
     var ctx = {
       name: 'Liquid',
       date: new Date()
     };
     engine.parseAndRender(src, ctx)
       .then(function(html) {
-        document.body.innerHTML += html
         return engine.renderFile('hello', ctx);
       })
       .then(function(html) {
diff --git a/demo/express/app.js b/demo/express/app.js
index 9ec2dc1cd..a92c9fb8d 100644
--- a/demo/express/app.js
+++ b/demo/express/app.js
@@ -1,8 +1,8 @@
-var express = require('express')
-var app = express()
-var Liquid = require('../..')
+const express = require('express')
+const Liquid = require('../..')
 
-var engine = Liquid({
+let app = express()
+let engine = Liquid({
   root: __dirname, // for layouts and partials
   extname: '.liquid'
 })
@@ -12,7 +12,7 @@ app.set('views', ['./partials', './views']) // specify the views directory
 app.set('view engine', 'liquid') // set to default
 
 app.get('/', function (req, res) {
-  var todos = ['fork and clone', 'make it better', 'make a pull request']
+  let todos = ['fork and clone', 'make it better', 'make a pull request']
   res.render('todolist', {
     todos: todos,
     title: 'Welcome to liquidjs!'
diff --git a/demo/express/index.js b/demo/express/index.js
index 5485b772d..af674359e 100644
--- a/demo/express/index.js
+++ b/demo/express/index.js
@@ -1,5 +1,5 @@
 const app = require('./app.js')
 
 app.listen(3000, function () {
-  console.log('Example app listening on port 3000!')
+  console.log('Express running: http://localhost:3000')
 })
diff --git a/demo/nodejs/index.js b/demo/nodejs/index.js
new file mode 100644
index 000000000..1d65ae5d7
--- /dev/null
+++ b/demo/nodejs/index.js
@@ -0,0 +1,10 @@
+const Liquid = require('../..')
+
+let engine = new Liquid()
+let src = 'Welcome to {{ name | capitalize}}, access time: {{date|date: "%H:%M:%S"}}'
+let ctx = {
+  name: 'Liquid',
+  date: new Date()
+}
+
+engine.parseAndRender(src, ctx).then(console.log)
diff --git a/dist/liquid.js b/dist/liquid.js
index c5a8d14c2..67158c5c7 100644
--- a/dist/liquid.js
+++ b/dist/liquid.js
@@ -1,9 +1,84 @@
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Liquid = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 'use strict';
 
-var strftime = require('./src/util/strftime.js');
-var _ = require('./src/util/underscore.js');
-var isTruthy = require('./src/syntax.js').isTruthy;
+var lexical = require('./lexical.js');
+var Syntax = require('./syntax.js');
+var assert = require('./util/assert.js');
+var _ = require('./util/underscore.js');
+
+var valueRE = new RegExp('' + lexical.value.source, 'g');
+
+module.exports = function (options) {
+  options = _.assign({}, options);
+  var filters = {};
+
+  var _filterInstance = {
+    render: function render(output, scope) {
+      var args = this.args.map(function (arg) {
+        return Syntax.evalValue(arg, scope);
+      });
+      args.unshift(output);
+      return this.filter.apply(null, args);
+    },
+    parse: function parse(str) {
+      var match = lexical.filterLine.exec(str);
+      assert(match, 'illegal filter: ' + str);
+
+      var name = match[1];
+      var argList = match[2] || '';
+      var filter = filters[name];
+      if (typeof filter !== 'function') {
+        if (options.strict_filters) {
+          throw new TypeError('undefined filter: ' + name);
+        }
+        this.name = name;
+        this.filter = function (x) {
+          return x;
+        };
+        this.args = [];
+        return this;
+      }
+
+      var args = [];
+      while (match = valueRE.exec(argList.trim())) {
+        var v = match[0];
+        var re = new RegExp(v + '\\s*:', 'g');
+        var keyMatch = re.exec(match.input);
+        var currentMatchIsKey = keyMatch && keyMatch.index === match.index;
+        currentMatchIsKey ? args.push('\'' + v + '\'') : args.push(v);
+      }
+
+      this.name = name;
+      this.filter = filter;
+      this.args = args;
+
+      return this;
+    }
+  };
+
+  function construct(str) {
+    var instance = Object.create(_filterInstance);
+    return instance.parse(str);
+  }
+
+  function register(name, filter) {
+    filters[name] = filter;
+  }
+
+  function clear() {
+    filters = {};
+  }
+
+  return {
+    construct: construct, register: register, clear: clear
+  };
+};
+},{"./lexical.js":4,"./syntax.js":9,"./util/assert.js":27,"./util/underscore.js":32}],2:[function(require,module,exports){
+'use strict';
+
+var strftime = require('./util/strftime.js');
+var _ = require('./util/underscore.js');
+var isTruthy = require('./syntax.js').isTruthy;
 
 var escapeMap = {
   '&': '&amp;',
@@ -214,28 +289,70 @@ function isValidDate(date) {
 
 registerAll.filters = filters;
 module.exports = registerAll;
-
-},{"./src/syntax.js":12,"./src/util/strftime.js":19,"./src/util/underscore.js":20}],2:[function(require,module,exports){
+},{"./syntax.js":9,"./util/strftime.js":31,"./util/underscore.js":32}],3:[function(require,module,exports){
 'use strict';
 
-var Scope = require('./src/scope');
-var _ = require('./src/util/underscore.js');
-var assert = require('./src/util/assert.js');
-var tokenizer = require('./src/tokenizer.js');
-var statFileAsync = require('./src/util/fs.js').statFileAsync;
-var readFileAsync = require('./src/util/fs.js').readFileAsync;
-var path = require('path');
-var url = require('./src/util/url.js');
-var Render = require('./src/render.js');
-var lexical = require('./src/lexical.js');
-var Tag = require('./src/tag.js');
-var Filter = require('./src/filter.js');
-var Parser = require('./src/parser');
-var Syntax = require('./src/syntax.js');
-var tags = require('./tags');
-var filters = require('./filters');
-var anySeries = require('./src/util/promise.js').anySeries;
-var Errors = require('./src/util/error.js');
+var _scope = require('./scope');
+
+var _scope2 = _interopRequireDefault(_scope);
+
+var _underscore = require('./util/underscore.js');
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+var _assert = require('./util/assert.js');
+
+var _assert2 = _interopRequireDefault(_assert);
+
+var _tokenizer = require('./tokenizer.js');
+
+var _tokenizer2 = _interopRequireDefault(_tokenizer);
+
+var _fs = require('./util/fs.js');
+
+var _path = require('path');
+
+var _path2 = _interopRequireDefault(_path);
+
+var _url = require('./util/url.js');
+
+var _lexical = require('./lexical.js');
+
+var _lexical2 = _interopRequireDefault(_lexical);
+
+var _render = require('./render.js');
+
+var _render2 = _interopRequireDefault(_render);
+
+var _tag = require('./tag.js');
+
+var _tag2 = _interopRequireDefault(_tag);
+
+var _filter = require('./filter.js');
+
+var _filter2 = _interopRequireDefault(_filter);
+
+var _parser = require('./parser');
+
+var _parser2 = _interopRequireDefault(_parser);
+
+var _syntax = require('./syntax.js');
+
+var _tags = require('./tags');
+
+var _tags2 = _interopRequireDefault(_tags);
+
+var _filters = require('./filters');
+
+var _filters2 = _interopRequireDefault(_filters);
+
+var _promise = require('./util/promise.js');
+
+var _error = require('./util/error.js');
+
+var _error2 = _interopRequireDefault(_error);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _engine = {
   init: function init(tag, filter, options) {
@@ -245,21 +362,21 @@ var _engine = {
     this.options = options;
     this.tag = tag;
     this.filter = filter;
-    this.parser = Parser(tag, filter);
-    this.renderer = Render();
+    this.parser = (0, _parser2.default)(tag, filter);
+    this.renderer = (0, _render2.default)();
 
-    tags(this);
-    filters(this);
+    (0, _tags2.default)(this);
+    (0, _filters2.default)(this);
 
     return this;
   },
   parse: function parse(html, filepath) {
-    var tokens = tokenizer.parse(html, filepath, this.options);
+    var tokens = _tokenizer2.default.parse(html, filepath, this.options);
     return this.parser.parse(tokens);
   },
   render: function render(tpl, ctx, opts) {
-    opts = _.assign({}, this.options, opts);
-    var scope = Scope.factory(ctx, opts);
+    opts = _underscore2.default.assign({}, this.options, opts);
+    var scope = _scope2.default.factory(ctx, opts);
     return this.renderer.renderTemplates(tpl, scope);
   },
   parseAndRender: function parseAndRender(html, ctx, opts) {
@@ -274,7 +391,7 @@ var _engine = {
   renderFile: function renderFile(filepath, ctx, opts) {
     var _this2 = this;
 
-    opts = _.assign({}, opts);
+    opts = _underscore2.default.assign({}, opts);
     return this.getTemplate(filepath, opts.root).then(function (templates) {
       return _this2.render(templates, ctx, opts);
     });
@@ -291,12 +408,12 @@ var _engine = {
   },
   lookup: function lookup(filepath, root) {
     root = this.options.root.concat(root || []);
-    root = _.uniq(root);
+    root = _underscore2.default.uniq(root);
     var paths = root.map(function (root) {
-      return path.resolve(root, filepath);
+      return _path2.default.resolve(root, filepath);
     });
-    return anySeries(paths, function (path) {
-      return statFileAsync(path).then(function () {
+    return (0, _promise.anySeries)(paths, function (path) {
+      return (0, _fs.statFileAsync)(path).then(function () {
         return path;
       });
     }).catch(function (e) {
@@ -310,7 +427,7 @@ var _engine = {
   getTemplateFromFile: function getTemplateFromFile(filepath, root) {
     var _this3 = this;
 
-    if (!path.extname(filepath)) {
+    if (!_path2.default.extname(filepath)) {
       filepath += this.options.extname;
     }
     return this.lookup(filepath, root).then(function (filepath) {
@@ -319,13 +436,13 @@ var _engine = {
         if (tpl) {
           return Promise.resolve(tpl);
         }
-        return readFileAsync(filepath).then(function (str) {
+        return (0, _fs.readFileAsync)(filepath).then(function (str) {
           return _this3.parse(str);
         }).then(function (tpl) {
           return _this3.cache[filepath] = tpl;
         });
       } else {
-        return readFileAsync(filepath).then(function (str) {
+        return (0, _fs.readFileAsync)(filepath).then(function (str) {
           return _this3.parse(str, filepath);
         });
       }
@@ -334,14 +451,14 @@ var _engine = {
   getTemplateFromUrl: function getTemplateFromUrl(filepath, root) {
     var _this4 = this;
 
-    var fullUrl;
-    if (url.valid(filepath)) {
+    var fullUrl = void 0;
+    if ((0, _url.valid)(filepath)) {
       fullUrl = filepath;
     } else {
-      if (!url.extname(filepath)) {
+      if (!(0, _url.extname)(filepath)) {
         filepath += this.options.extname;
       }
-      fullUrl = url.resolve(root || this.options.root, filepath);
+      fullUrl = (0, _url.resolve)(root || this.options.root, filepath);
     }
     if (this.options.cache) {
       var tpl = this.cache[filepath];
@@ -353,11 +470,11 @@ var _engine = {
       var xhr = new XMLHttpRequest();
       xhr.onload = function () {
         if (xhr.status >= 200 && xhr.status < 300) {
-          var tpl = _this4.parse(xhr.responseText);
+          var _tpl = _this4.parse(xhr.responseText);
           if (_this4.options.cache) {
-            _this4.cache[filepath] = tpl;
+            _this4.cache[filepath] = _tpl;
           }
-          resolve(tpl);
+          resolve(_tpl);
         } else {
           reject(new Error(xhr.statusText));
         }
@@ -373,7 +490,7 @@ var _engine = {
     opts = opts || {};
     var self = this;
     return function (filePath, ctx, callback) {
-      assert(Array.isArray(this.root) || _.isString(this.root), 'illegal views root, are you using express.js?');
+      (0, _assert2.default)(Array.isArray(this.root) || _underscore2.default.isString(this.root), 'illegal views root, are you using express.js?');
       opts.root = this.root;
       self.renderFile(filePath, ctx, opts).then(function (html) {
         return callback(null, html);
@@ -385,7 +502,7 @@ var _engine = {
 };
 
 function factory(options) {
-  options = _.assign({
+  options = _underscore2.default.assign({
     root: ['.'],
     cache: false,
     extname: '',
@@ -401,165 +518,32 @@ function factory(options) {
   options.root = normalizeStringArray(options.root);
 
   var engine = Object.create(_engine);
-  engine.init(Tag(), Filter(options), options);
+  engine.init((0, _tag2.default)(), (0, _filter2.default)(options), options);
   return engine;
 }
 
 function normalizeStringArray(value) {
   if (Array.isArray(value)) return value;
-  if (_.isString(value)) return [value];
+  if (_underscore2.default.isString(value)) return [value];
   return [];
 }
 
-factory.lexical = lexical;
-factory.isTruthy = Syntax.isTruthy;
-factory.isFalsy = Syntax.isFalsy;
-factory.evalExp = Syntax.evalExp;
-factory.evalValue = Syntax.evalValue;
-factory.Types = {
-  ParseError: Errors.ParseError,
-  TokenizationEroor: Errors.TokenizationError,
-  RenderBreakError: Errors.RenderBreakError,
-  AssertionError: Errors.AssertionError
+var Types = {
+  ParseError: _error2.default.ParseError,
+  TokenizationEroor: _error2.default.TokenizationError,
+  RenderBreakError: _error2.default.RenderBreakError,
+  AssertionError: _error2.default.AssertionError
 };
 
+factory.isTruthy = _syntax.isTruthy;
+factory.isFalsy = _syntax.isFalsy;
+factory.evalExp = _syntax.evalExp;
+factory.evalValue = _syntax.evalValue;
+factory.Types = Types;
+factory.lexical = _lexical2.default;
+
 module.exports = factory;
-
-},{"./filters":1,"./src/filter.js":6,"./src/lexical.js":7,"./src/parser":9,"./src/render.js":10,"./src/scope":11,"./src/syntax.js":12,"./src/tag.js":13,"./src/tokenizer.js":14,"./src/util/assert.js":15,"./src/util/error.js":16,"./src/util/fs.js":17,"./src/util/promise.js":18,"./src/util/underscore.js":20,"./src/util/url.js":21,"./tags":33,"path":4}],3:[function(require,module,exports){
-"use strict";
-
-},{}],4:[function(require,module,exports){
-"use strict";
-
-},{}],5:[function(require,module,exports){
-"use strict";
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-// Copyright 2014 Simon Lydell
-// X11 (“MIT”) Licensed. (See LICENSE.)
-
-void function (root, factory) {
-  if (typeof define === "function" && define.amd) {
-    define(factory);
-  } else if ((typeof exports === "undefined" ? "undefined" : _typeof(exports)) === "object") {
-    module.exports = factory();
-  } else {
-    root.resolveUrl = factory();
-  }
-}(undefined, function () {
-
-  function resolveUrl() /* ...urls */{
-    var numUrls = arguments.length;
-
-    if (numUrls === 0) {
-      throw new Error("resolveUrl requires at least one argument; got none.");
-    }
-
-    var base = document.createElement("base");
-    base.href = arguments[0];
-
-    if (numUrls === 1) {
-      return base.href;
-    }
-
-    var head = document.getElementsByTagName("head")[0];
-    head.insertBefore(base, head.firstChild);
-
-    var a = document.createElement("a");
-    var resolved;
-
-    for (var index = 1; index < numUrls; index++) {
-      a.href = arguments[index];
-      resolved = a.href;
-      base.href = resolved;
-    }
-
-    head.removeChild(base);
-
-    return resolved;
-  }
-
-  return resolveUrl;
-});
-
-},{}],6:[function(require,module,exports){
-'use strict';
-
-var lexical = require('./lexical.js');
-var Syntax = require('./syntax.js');
-var assert = require('./util/assert.js');
-var _ = require('./util/underscore.js');
-
-var valueRE = new RegExp('' + lexical.value.source, 'g');
-
-module.exports = function (options) {
-  options = _.assign({}, options);
-  var filters = {};
-
-  var _filterInstance = {
-    render: function render(output, scope) {
-      var args = this.args.map(function (arg) {
-        return Syntax.evalValue(arg, scope);
-      });
-      args.unshift(output);
-      return this.filter.apply(null, args);
-    },
-    parse: function parse(str) {
-      var match = lexical.filterLine.exec(str);
-      assert(match, 'illegal filter: ' + str);
-
-      var name = match[1];
-      var argList = match[2] || '';
-      var filter = filters[name];
-      if (typeof filter !== 'function') {
-        if (options.strict_filters) {
-          throw new TypeError('undefined filter: ' + name);
-        }
-        this.name = name;
-        this.filter = function (x) {
-          return x;
-        };
-        this.args = [];
-        return this;
-      }
-
-      var args = [];
-      while (match = valueRE.exec(argList.trim())) {
-        var v = match[0];
-        var re = new RegExp(v + '\\s*:', 'g');
-        var keyMatch = re.exec(match.input);
-        var currentMatchIsKey = keyMatch && keyMatch.index === match.index;
-        currentMatchIsKey ? args.push('\'' + v + '\'') : args.push(v);
-      }
-
-      this.name = name;
-      this.filter = filter;
-      this.args = args;
-
-      return this;
-    }
-  };
-
-  function construct(str) {
-    var instance = Object.create(_filterInstance);
-    return instance.parse(str);
-  }
-
-  function register(name, filter) {
-    filters[name] = filter;
-  }
-
-  function clear() {
-    filters = {};
-  }
-
-  return {
-    construct: construct, register: register, clear: clear
-  };
-};
-
-},{"./lexical.js":7,"./syntax.js":12,"./util/assert.js":15,"./util/underscore.js":20}],7:[function(require,module,exports){
+},{"./filter.js":1,"./filters":2,"./lexical.js":4,"./parser":6,"./render.js":7,"./scope":8,"./syntax.js":9,"./tag.js":10,"./tags":21,"./tokenizer.js":26,"./util/assert.js":27,"./util/error.js":28,"./util/fs.js":29,"./util/promise.js":30,"./util/underscore.js":32,"./util/url.js":33,"path":36}],4:[function(require,module,exports){
 'use strict';
 
 // quote related
@@ -674,8 +658,7 @@ module.exports = {
   matchValue: matchValue,
   isInteger: isInteger
 };
-
-},{}],8:[function(require,module,exports){
+},{}],5:[function(require,module,exports){
 'use strict';
 
 module.exports = function (isTruthy) {
@@ -711,8 +694,7 @@ module.exports = function (isTruthy) {
     }
   };
 };
-
-},{}],9:[function(require,module,exports){
+},{}],6:[function(require,module,exports){
 'use strict';
 
 var lexical = require('./lexical.js');
@@ -739,7 +721,7 @@ module.exports = function (Tag, Filter) {
     },
     start: function start() {
       this.trigger('start');
-      var token;
+      var token = void 0;
       while (!this.stopRequested && (token = this.tokens.shift())) {
         if (this.trigger('token', token)) continue;
         if (token.type === 'tag' && this.trigger('tag:' + token.name, token)) {
@@ -758,7 +740,7 @@ module.exports = function (Tag, Filter) {
   };
 
   function parse(tokens) {
-    var token;
+    var token = void 0;
     var templates = [];
     while (token = tokens.shift()) {
       templates.push(parseToken(token, tokens));
@@ -822,8 +804,7 @@ module.exports = function (Tag, Filter) {
     parseValue: parseValue
   };
 };
-
-},{"./lexical.js":7,"./util/assert.js":15,"./util/error.js":16}],10:[function(require,module,exports){
+},{"./lexical.js":4,"./util/assert.js":27,"./util/error.js":28}],7:[function(require,module,exports){
 'use strict';
 
 var Syntax = require('./syntax.js');
@@ -903,8 +884,7 @@ function factory() {
 }
 
 module.exports = factory;
-
-},{"./syntax.js":12,"./util/assert.js":15,"./util/error.js":16,"./util/promise.js":18,"./util/underscore.js":20}],11:[function(require,module,exports){
+},{"./syntax.js":9,"./util/assert.js":27,"./util/error.js":28,"./util/promise.js":30,"./util/underscore.js":32}],8:[function(require,module,exports){
 'use strict';
 
 var _ = require('./util/underscore.js');
@@ -1098,18 +1078,17 @@ exports.types = {
   IncrementScope: Object.create(null),
   DecrementScope: Object.create(null)
 };
-
-},{"./lexical.js":7,"./util/assert.js":15,"./util/underscore.js":20}],12:[function(require,module,exports){
+},{"./lexical.js":4,"./util/assert.js":27,"./util/underscore.js":32}],9:[function(require,module,exports){
 'use strict';
 
 var operators = require('./operators.js')(isTruthy);
 var lexical = require('./lexical.js');
-var assert = require('../src/util/assert.js');
+var assert = require('./util/assert.js');
 
 function evalExp(exp, scope) {
   assert(scope, 'unable to evalExp: scope undefined');
   var operatorREs = lexical.operators;
-  var match;
+  var match = void 0;
   for (var i = 0; i < operatorREs.length; i++) {
     var operatorRE = operatorREs[i];
     var expRE = new RegExp('^(' + lexical.quoteBalanced.source + ')(' + operatorRE.source + ')(' + lexical.quoteBalanced.source + ')$');
@@ -1158,8 +1137,7 @@ function isFalsy(val) {
 module.exports = {
   evalExp: evalExp, evalValue: evalValue, isTruthy: isTruthy, isFalsy: isFalsy
 };
-
-},{"../src/util/assert.js":15,"./lexical.js":7,"./operators.js":8}],13:[function(require,module,exports){
+},{"./lexical.js":4,"./operators.js":5,"./util/assert.js":27}],10:[function(require,module,exports){
 'use strict';
 
 var lexical = require('./lexical.js');
@@ -1226,8 +1204,757 @@ module.exports = function () {
     clear: clear
   };
 };
+},{"./lexical.js":4,"./syntax.js":9,"./util/assert.js":27}],11:[function(require,module,exports){
+'use strict';
 
-},{"./lexical.js":7,"./syntax.js":12,"./util/assert.js":15}],14:[function(require,module,exports){
+var _index = require('../index');
+
+var _assert = require('../util/assert.js');
+
+var _assert2 = _interopRequireDefault(_assert);
+
+var _scope = require('../scope');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var re = new RegExp('(' + _index.lexical.identifier.source + ')\\s*=(.*)');
+
+module.exports = function (liquid) {
+  liquid.registerTag('assign', {
+    parse: function parse(token) {
+      var match = token.args.match(re);
+      (0, _assert2.default)(match, 'illegal token ' + token.raw);
+      this.key = match[1];
+      this.value = match[2];
+    },
+    render: function render(scope) {
+      var ctx = Object.create(_scope.types.AssignScope);
+      ctx[this.key] = liquid.evalValue(this.value, scope);
+      scope.push(ctx);
+      return Promise.resolve('');
+    }
+  });
+};
+},{"../index":3,"../scope":8,"../util/assert.js":27}],12:[function(require,module,exports){
+'use strict';
+
+var Liquid = require('..');
+var lexical = Liquid.lexical;
+var re = new RegExp('(' + lexical.identifier.source + ')');
+var assert = require('../util/assert.js');
+var types = require('../scope.js').types;
+
+module.exports = function (liquid) {
+  liquid.registerTag('capture', {
+    parse: function parse(tagToken, remainTokens) {
+      var _this = this;
+
+      var match = tagToken.args.match(re);
+      assert(match, tagToken.args + ' not valid identifier');
+
+      this.variable = match[1];
+      this.templates = [];
+
+      var stream = liquid.parser.parseStream(remainTokens);
+      stream.on('tag:endcapture', function (token) {
+        return stream.stop();
+      }).on('template', function (tpl) {
+        return _this.templates.push(tpl);
+      }).on('end', function (x) {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+      stream.start();
+    },
+    render: function render(scope, hash) {
+      var _this2 = this;
+
+      return liquid.renderer.renderTemplates(this.templates, scope).then(function (html) {
+        var ctx = Object.create(types.CaptureScope);
+        ctx[_this2.variable] = html;
+        scope.push(ctx);
+      });
+    }
+  });
+};
+},{"..":3,"../scope.js":8,"../util/assert.js":27}],13:[function(require,module,exports){
+'use strict';
+
+var _ = require('..');
+
+var _2 = _interopRequireDefault(_);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = function (liquid) {
+  liquid.registerTag('case', {
+
+    parse: function parse(tagToken, remainTokens) {
+      var _this = this;
+
+      this.cond = tagToken.args;
+      this.cases = [];
+      this.elseTemplates = [];
+
+      var p = [];
+      var stream = liquid.parser.parseStream(remainTokens).on('tag:when', function (token) {
+        _this.cases.push({
+          val: token.args,
+          templates: p = []
+        });
+      }).on('tag:else', function () {
+        return p = _this.elseTemplates;
+      }).on('tag:endcase', function (token) {
+        return stream.stop();
+      }).on('template', function (tpl) {
+        return p.push(tpl);
+      }).on('end', function (x) {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+
+      stream.start();
+    },
+
+    render: function render(scope, hash) {
+      for (var i = 0; i < this.cases.length; i++) {
+        var branch = this.cases[i];
+        var val = _2.default.evalExp(branch.val, scope);
+        var cond = _2.default.evalExp(this.cond, scope);
+        if (val === cond) {
+          return liquid.renderer.renderTemplates(branch.templates, scope);
+        }
+      }
+      return liquid.renderer.renderTemplates(this.elseTemplates, scope);
+    }
+  });
+};
+},{"..":3}],14:[function(require,module,exports){
+'use strict';
+
+module.exports = function (liquid) {
+  liquid.registerTag('comment', {
+    parse: function parse(tagToken, remainTokens) {
+      var stream = liquid.parser.parseStream(remainTokens);
+      stream.on('token', function (token) {
+        if (token.name === 'endcomment') stream.stop();
+      }).on('end', function (x) {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+      stream.start();
+    }
+  });
+};
+},{}],15:[function(require,module,exports){
+'use strict';
+
+var Liquid = require('..');
+var lexical = Liquid.lexical;
+var groupRE = new RegExp('^(?:(' + lexical.value.source + ')\\s*:\\s*)?(.*)$');
+var candidatesRE = new RegExp(lexical.value.source, 'g');
+var assert = require('../util/assert.js');
+
+module.exports = function (liquid) {
+  liquid.registerTag('cycle', {
+
+    parse: function parse(tagToken, remainTokens) {
+      var match = groupRE.exec(tagToken.args);
+      assert(match, 'illegal tag: ' + tagToken.raw);
+
+      this.group = match[1] || '';
+      var candidates = match[2];
+
+      this.candidates = [];
+
+      while (match = candidatesRE.exec(candidates)) {
+        this.candidates.push(match[0]);
+      }
+      assert(this.candidates.length, 'empty candidates: ' + tagToken.raw);
+    },
+
+    render: function render(scope, hash) {
+      var group = Liquid.evalValue(this.group, scope);
+      var fingerprint = 'cycle:' + group + ':' + this.candidates.join(',');
+
+      var groups = scope.opts.groups = scope.opts.groups || {};
+      var idx = groups[fingerprint];
+
+      if (idx === undefined) {
+        idx = groups[fingerprint] = 0;
+      }
+
+      var candidate = this.candidates[idx];
+      idx = (idx + 1) % this.candidates.length;
+      groups[fingerprint] = idx;
+
+      return Promise.resolve(Liquid.evalValue(candidate, scope));
+    }
+  });
+};
+},{"..":3,"../util/assert.js":27}],16:[function(require,module,exports){
+'use strict';
+
+var Liquid = require('..');
+var lexical = Liquid.lexical;
+var assert = require('../util/assert.js');
+var types = require('../scope').types;
+
+module.exports = function (liquid) {
+  liquid.registerTag('decrement', {
+    parse: function parse(token) {
+      var match = token.args.match(lexical.identifier);
+      assert(match, 'illegal identifier ' + token.args);
+      this.variable = match[0];
+    },
+    render: function render(scope, hash) {
+      var context = scope.findContextFor(this.variable, function (ctx) {
+        return Object.getPrototypeOf(ctx) !== types.CaptureScope && Object.getPrototypeOf(ctx) !== types.AssignScope;
+      });
+      if (!context) {
+        context = Object.create(types.DecrementScope);
+        scope.unshift(context);
+      }
+      if (typeof context[this.variable] !== 'number') {
+        context[this.variable] = 0;
+      }
+      return --context[this.variable];
+    }
+  });
+};
+},{"..":3,"../scope":8,"../util/assert.js":27}],17:[function(require,module,exports){
+'use strict';
+
+var _index = require('../index');
+
+var _index2 = _interopRequireDefault(_index);
+
+var _promise = require('../util/promise.js');
+
+var _underscore = require('../util/underscore.js');
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+var _assert = require('../util/assert.js');
+
+var _assert2 = _interopRequireDefault(_assert);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var RenderBreakError = _index2.default.Types.RenderBreakError;
+var re = new RegExp('^(' + _index.lexical.identifier.source + ')\\s+in\\s+' + ('(' + _index.lexical.value.source + ')') + ('(?:\\s+' + _index.lexical.hash.source + ')*') + '(?:\\s+(reversed))?' + ('(?:\\s+' + _index.lexical.hash.source + ')*$'));
+
+module.exports = function (liquid) {
+  liquid.registerTag('for', {
+
+    parse: function parse(tagToken, remainTokens) {
+      var _this = this;
+
+      var match = re.exec(tagToken.args);
+      (0, _assert2.default)(match, 'illegal tag: ' + tagToken.raw);
+      this.variable = match[1];
+      this.collection = match[2];
+      this.reversed = !!match[3];
+
+      this.templates = [];
+      this.elseTemplates = [];
+
+      var p = void 0;
+      var stream = liquid.parser.parseStream(remainTokens).on('start', function () {
+        return p = _this.templates;
+      }).on('tag:else', function () {
+        return p = _this.elseTemplates;
+      }).on('tag:endfor', function () {
+        return stream.stop();
+      }).on('template', function (tpl) {
+        return p.push(tpl);
+      }).on('end', function () {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+
+      stream.start();
+    },
+
+    render: function render(scope, hash) {
+      var _this2 = this;
+
+      var collection = _index2.default.evalExp(this.collection, scope);
+
+      if (!Array.isArray(collection)) {
+        if (_underscore2.default.isString(collection) && collection.length > 0) {
+          collection = [collection];
+        } else if (_underscore2.default.isObject(collection)) {
+          collection = Object.keys(collection).map(function (key) {
+            return [key, collection[key]];
+          });
+        }
+      }
+      if (!Array.isArray(collection) || !collection.length) {
+        return liquid.renderer.renderTemplates(this.elseTemplates, scope);
+      }
+
+      var offset = hash.offset || 0;
+      var limit = hash.limit === undefined ? collection.length : hash.limit;
+
+      collection = collection.slice(offset, offset + limit);
+      if (this.reversed) collection.reverse();
+
+      var contexts = collection.map(function (item, i) {
+        var ctx = {};
+        ctx[_this2.variable] = item;
+        ctx.forloop = {
+          first: i === 0,
+          index: i + 1,
+          index0: i,
+          last: i === collection.length - 1,
+          length: collection.length,
+          rindex: collection.length - i,
+          rindex0: collection.length - i - 1
+        };
+        return ctx;
+      });
+
+      var html = '';
+      return (0, _promise.mapSeries)(contexts, function (context) {
+        return Promise.resolve().then(function () {
+          return scope.push(context);
+        }).then(function () {
+          return liquid.renderer.renderTemplates(_this2.templates, scope);
+        }).then(function (partial) {
+          return html += partial;
+        }).catch(function (e) {
+          if (e instanceof RenderBreakError) {
+            html += e.resolvedHTML;
+            if (e.message === 'continue') return;
+          }
+          throw e;
+        }).then(function () {
+          return scope.pop(context);
+        });
+      }).catch(function (e) {
+        if (e instanceof RenderBreakError && e.message === 'break') {
+          return;
+        }
+        throw e;
+      }).then(function () {
+        return html;
+      });
+    }
+  });
+};
+},{"../index":3,"../util/assert.js":27,"../util/promise.js":30,"../util/underscore.js":32}],18:[function(require,module,exports){
+'use strict';
+
+var _ = require('..');
+
+var _2 = _interopRequireDefault(_);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = function (liquid) {
+  liquid.registerTag('if', {
+
+    parse: function parse(tagToken, remainTokens) {
+      var _this = this;
+
+      this.branches = [];
+      this.elseTemplates = [];
+
+      var p = void 0;
+      var stream = liquid.parser.parseStream(remainTokens).on('start', function () {
+        return _this.branches.push({
+          cond: tagToken.args,
+          templates: p = []
+        });
+      }).on('tag:elsif', function (token) {
+        _this.branches.push({
+          cond: token.args,
+          templates: p = []
+        });
+      }).on('tag:else', function () {
+        return p = _this.elseTemplates;
+      }).on('tag:endif', function (token) {
+        return stream.stop();
+      }).on('template', function (tpl) {
+        return p.push(tpl);
+      }).on('end', function (x) {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+
+      stream.start();
+    },
+
+    render: function render(scope, hash) {
+      for (var i = 0; i < this.branches.length; i++) {
+        var branch = this.branches[i];
+        var cond = _2.default.evalExp(branch.cond, scope);
+        if (_2.default.isTruthy(cond)) {
+          return liquid.renderer.renderTemplates(branch.templates, scope);
+        }
+      }
+      return liquid.renderer.renderTemplates(this.elseTemplates, scope);
+    }
+  });
+};
+},{"..":3}],19:[function(require,module,exports){
+'use strict';
+
+var Liquid = require('..');
+var lexical = Liquid.lexical;
+var withRE = new RegExp('with\\s+(' + lexical.value.source + ')');
+var staticFileRE = /[^\s,]+/;
+var assert = require('../util/assert.js');
+
+module.exports = function (liquid) {
+  liquid.registerTag('include', {
+    parse: function parse(token) {
+      var match = staticFileRE.exec(token.args);
+      if (match) {
+        this.staticValue = match[0];
+      }
+
+      match = lexical.value.exec(token.args);
+      if (match) {
+        this.value = match[0];
+      }
+
+      match = withRE.exec(token.args);
+      if (match) {
+        this.with = match[1];
+      }
+    },
+    render: function render(scope, hash) {
+      var _this = this;
+
+      var pFilepath = void 0;
+      if (scope.opts.dynamicPartials) {
+        if (lexical.quotedLine.exec(this.value)) {
+          var template = this.value.slice(1, -1);
+          pFilepath = liquid.parseAndRender(template, scope.getAll(), scope.opts);
+        } else {
+          pFilepath = Promise.resolve(Liquid.evalValue(this.value, scope));
+        }
+      } else {
+        pFilepath = Promise.resolve(this.staticValue);
+      }
+
+      var originBlocks = scope.opts.blocks;
+      var originBlockMode = scope.opts.blockMode;
+
+      return pFilepath.then(function (filepath) {
+        assert(filepath, 'cannot include with empty filename');
+        scope.opts.blocks = {};
+        scope.opts.blockMode = 'output';
+        if (_this.with) {
+          hash[filepath] = Liquid.evalValue(_this.with, scope);
+        }
+        return liquid.getTemplate(filepath, scope.opts.root);
+      }).then(function (templates) {
+        scope.push(hash);
+        return liquid.renderer.renderTemplates(templates, scope);
+      }).then(function (html) {
+        scope.pop(hash);
+        scope.opts.blocks = originBlocks;
+        scope.opts.blockMode = originBlockMode;
+        return html;
+      });
+    }
+  });
+};
+},{"..":3,"../util/assert.js":27}],20:[function(require,module,exports){
+'use strict';
+
+var Liquid = require('..');
+var assert = require('../util/assert.js');
+var lexical = Liquid.lexical;
+var types = require('../scope').types;
+
+module.exports = function (liquid) {
+  liquid.registerTag('increment', {
+    parse: function parse(token) {
+      var match = token.args.match(lexical.identifier);
+      assert(match, 'illegal identifier ' + token.args);
+      this.variable = match[0];
+    },
+    render: function render(scope, hash) {
+      var context = scope.findContextFor(this.variable, function (ctx) {
+        return Object.getPrototypeOf(ctx) !== types.CaptureScope && Object.getPrototypeOf(ctx) !== types.AssignScope;
+      });
+      if (!context) {
+        context = Object.create(types.IncrementScope);
+        scope.unshift(context);
+      }
+      if (typeof context[this.variable] !== 'number') {
+        context[this.variable] = 0;
+      }
+      var val = context[this.variable];
+      context[this.variable]++;
+      return val;
+    }
+  });
+};
+},{"..":3,"../scope":8,"../util/assert.js":27}],21:[function(require,module,exports){
+'use strict';
+
+module.exports = function (engine) {
+  require('./assign.js')(engine);
+  require('./capture.js')(engine);
+  require('./case.js')(engine);
+  require('./comment.js')(engine);
+  require('./cycle.js')(engine);
+  require('./decrement.js')(engine);
+  require('./for.js')(engine);
+  require('./if.js')(engine);
+  require('./include.js')(engine);
+  require('./increment.js')(engine);
+  require('./layout.js')(engine);
+  require('./raw.js')(engine);
+  require('./tablerow.js')(engine);
+  require('./unless.js')(engine);
+};
+},{"./assign.js":11,"./capture.js":12,"./case.js":13,"./comment.js":14,"./cycle.js":15,"./decrement.js":16,"./for.js":17,"./if.js":18,"./include.js":19,"./increment.js":20,"./layout.js":22,"./raw.js":23,"./tablerow.js":24,"./unless.js":25}],22:[function(require,module,exports){
+'use strict';
+
+var Liquid = require('..');
+var lexical = Liquid.lexical;
+var assert = require('../util/assert.js');
+var staticFileRE = /\S+/;
+
+/*
+ * blockMode:
+ * * "store": store rendered html into blocks
+ * * "output": output rendered html
+ */
+
+module.exports = function (liquid) {
+  liquid.registerTag('layout', {
+    parse: function parse(token, remainTokens) {
+      var match = staticFileRE.exec(token.args);
+      if (match) {
+        this.staticLayout = match[0];
+      }
+
+      match = lexical.value.exec(token.args);
+      if (match) {
+        this.layout = match[0];
+      }
+
+      this.tpls = liquid.parser.parse(remainTokens);
+    },
+    render: function render(scope, hash) {
+      var layout = scope.opts.dynamicPartials ? Liquid.evalValue(this.layout, scope) : this.staticLayout;
+      assert(layout, 'cannot apply layout with empty filename');
+
+      // render the remaining tokens immediately
+      scope.opts.blockMode = 'store';
+      return liquid.renderer.renderTemplates(this.tpls, scope).then(function (html) {
+        if (scope.opts.blocks[''] === undefined) {
+          scope.opts.blocks[''] = html;
+        }
+        return liquid.getTemplate(layout, scope.opts.root);
+      }).then(function (templates) {
+        scope.push(hash);
+        scope.opts.blockMode = 'output';
+        return liquid.renderer.renderTemplates(templates, scope);
+      }).then(function (partial) {
+        scope.pop(hash);
+        return partial;
+      });
+    }
+  });
+
+  liquid.registerTag('block', {
+    parse: function parse(token, remainTokens) {
+      var _this = this;
+
+      var match = /\w+/.exec(token.args);
+      this.block = match ? match[0] : '';
+
+      this.tpls = [];
+      var stream = liquid.parser.parseStream(remainTokens).on('tag:endblock', function () {
+        return stream.stop();
+      }).on('template', function (tpl) {
+        return _this.tpls.push(tpl);
+      }).on('end', function () {
+        throw new Error('tag ' + token.raw + ' not closed');
+      });
+      stream.start();
+    },
+    render: function render(scope) {
+      var _this2 = this;
+
+      return Promise.resolve(scope.opts.blocks[this.block]).then(function (html) {
+        return html === undefined
+        // render default block
+        ? liquid.renderer.renderTemplates(_this2.tpls, scope)
+        // use child-defined block
+        : html;
+      }).then(function (html) {
+        if (scope.opts.blockMode === 'store') {
+          scope.opts.blocks[_this2.block] = html;
+          return '';
+        }
+        return html;
+      });
+    }
+  });
+};
+},{"..":3,"../util/assert.js":27}],23:[function(require,module,exports){
+'use strict';
+
+module.exports = function (liquid) {
+  liquid.registerTag('raw', {
+    parse: function parse(tagToken, remainTokens) {
+      var _this = this;
+
+      this.tokens = [];
+
+      var stream = liquid.parser.parseStream(remainTokens);
+      stream.on('token', function (token) {
+        if (token.name === 'endraw') stream.stop();else _this.tokens.push(token);
+      }).on('end', function () {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+      stream.start();
+    },
+    render: function render(scope, hash) {
+      return this.tokens.map(function (token) {
+        return token.raw;
+      }).join('');
+    }
+  });
+};
+},{}],24:[function(require,module,exports){
+'use strict';
+
+var _ = require('..');
+
+var _2 = _interopRequireDefault(_);
+
+var _promise = require('../util/promise.js');
+
+var _assert = require('../util/assert.js');
+
+var _assert2 = _interopRequireDefault(_assert);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var lexical = _2.default.lexical;
+var re = new RegExp('^(' + lexical.identifier.source + ')\\s+in\\s+' + ('(' + lexical.value.source + ')') + ('(?:\\s+' + lexical.hash.source + ')*$'));
+
+module.exports = function (liquid) {
+  liquid.registerTag('tablerow', {
+
+    parse: function parse(tagToken, remainTokens) {
+      var _this = this;
+
+      var match = re.exec(tagToken.args);
+      (0, _assert2.default)(match, 'illegal tag: ' + tagToken.raw);
+
+      this.variable = match[1];
+      this.collection = match[2];
+      this.templates = [];
+
+      var p = void 0;
+      var stream = liquid.parser.parseStream(remainTokens).on('start', function () {
+        return p = _this.templates;
+      }).on('tag:endtablerow', function (token) {
+        return stream.stop();
+      }).on('template', function (tpl) {
+        return p.push(tpl);
+      }).on('end', function () {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+
+      stream.start();
+    },
+
+    render: function render(scope, hash) {
+      var _this2 = this;
+
+      var collection = _2.default.evalExp(this.collection, scope) || [];
+
+      var html = '';
+      var offset = hash.offset || 0;
+      var limit = hash.limit === undefined ? collection.length : hash.limit;
+
+      var cols = hash.cols;
+      var row = void 0;
+      var col = void 0;
+
+      // build array of arguments to pass to sequential promises...
+      collection = collection.slice(offset, offset + limit);
+      if (!cols) cols = collection.length;
+      var contexts = collection.map(function (item, i) {
+        var ctx = {};
+        ctx[_this2.variable] = item;
+        return ctx;
+      });
+
+      return (0, _promise.mapSeries)(contexts, function (context, idx) {
+        row = Math.floor(idx / cols) + 1;
+        col = idx % cols + 1;
+        if (col === 1) {
+          if (row !== 1) {
+            html += '</tr>';
+          }
+          html += '<tr class="row' + row + '">';
+        }
+
+        html += '<td class="col' + col + '">';
+        scope.push(context);
+        return liquid.renderer.renderTemplates(_this2.templates, scope).then(function (partial) {
+          scope.pop(context);
+          html += partial;
+          html += '</td>';
+          return html;
+        });
+      }).then(function () {
+        if (row > 0) {
+          html += '</tr>';
+        }
+        return html;
+      });
+    }
+  });
+};
+},{"..":3,"../util/assert.js":27,"../util/promise.js":30}],25:[function(require,module,exports){
+'use strict';
+
+var _index = require('../index');
+
+var _index2 = _interopRequireDefault(_index);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = function (liquid) {
+  liquid.registerTag('unless', {
+    parse: function parse(tagToken, remainTokens) {
+      var _this = this;
+
+      this.templates = [];
+      this.elseTemplates = [];
+      var p = void 0;
+      var stream = liquid.parser.parseStream(remainTokens).on('start', function (x) {
+        p = _this.templates;
+        _this.cond = tagToken.args;
+      }).on('tag:else', function () {
+        return p = _this.elseTemplates;
+      }).on('tag:endunless', function (token) {
+        return stream.stop();
+      }).on('template', function (tpl) {
+        return p.push(tpl);
+      }).on('end', function (x) {
+        throw new Error('tag ' + tagToken.raw + ' not closed');
+      });
+
+      stream.start();
+    },
+
+    render: function render(scope, hash) {
+      var cond = _index2.default.evalExp(this.cond, scope);
+      return _index2.default.isFalsy(cond) ? liquid.renderer.renderTemplates(this.templates, scope) : liquid.renderer.renderTemplates(this.elseTemplates, scope);
+    }
+  });
+};
+},{"../index":3}],26:[function(require,module,exports){
 'use strict';
 
 var lexical = require('./lexical.js');
@@ -1319,8 +2046,7 @@ function LineNumber(html) {
 
 exports.parse = parse;
 exports.whiteSpaceCtrl = whiteSpaceCtrl;
-
-},{"./lexical.js":7,"./util/assert.js":15,"./util/error.js":16,"./util/underscore.js":20,"./whitespace-ctrl.js":22}],15:[function(require,module,exports){
+},{"./lexical.js":4,"./util/assert.js":27,"./util/error.js":28,"./util/underscore.js":32,"./whitespace-ctrl.js":34}],27:[function(require,module,exports){
 'use strict';
 
 var AssertionError = require('./error.js').AssertionError;
@@ -1333,11 +2059,14 @@ function assert(predicate, message) {
 }
 
 module.exports = assert;
-
-},{"./error.js":16}],16:[function(require,module,exports){
+},{"./error.js":28}],28:[function(require,module,exports){
 'use strict';
 
-var _ = require('./underscore.js');
+var _underscore = require('./underscore.js');
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function initError() {
   this.name = this.constructor.name;
@@ -1365,7 +2094,7 @@ TokenizationError.prototype = Object.create(Error.prototype);
 TokenizationError.prototype.constructor = TokenizationError;
 
 function ParseError(e, token) {
-  _.assign(this, e);
+  _underscore2.default.assign(this, e);
   this.originalError = e;
 
   initLiquidError.call(this, e, token);
@@ -1378,7 +2107,7 @@ function RenderError(e, tpl) {
   if (e instanceof RenderError) {
     return e;
   }
-  _.assign(this, e);
+  _underscore2.default.assign(this, e);
   this.originalError = e;
 
   initLiquidError.call(this, e, tpl.token);
@@ -1405,7 +2134,7 @@ function mkContext(input, line) {
   var begin = Math.max(line - 2, 1);
   var end = Math.min(line + 3, lines.length);
 
-  var context = _.range(begin, end + 1).map(function (l) {
+  var context = _underscore2.default.range(begin, end + 1).map(function (l) {
     return [l === line ? '>> ' : '   ', align(l, end), '| ', lines[l - 1]].join('');
   }).join('\n');
 
@@ -1437,8 +2166,7 @@ module.exports = {
   AssertionError: AssertionError,
   RenderError: RenderError
 };
-
-},{"./underscore.js":20}],17:[function(require,module,exports){
+},{"./underscore.js":32}],29:[function(require,module,exports){
 'use strict';
 
 var fs = require('fs');
@@ -1463,8 +2191,7 @@ module.exports = {
   readFileAsync: readFileAsync,
   statFileAsync: statFileAsync
 };
-
-},{"fs":3}],18:[function(require,module,exports){
+},{"fs":35}],30:[function(require,module,exports){
 'use strict';
 
 /*
@@ -1506,8 +2233,7 @@ function mapSeries(iterable, iteratee) {
 
 exports.anySeries = anySeries;
 exports.mapSeries = mapSeries;
-
-},{}],19:[function(require,module,exports){
+},{}],31:[function(require,module,exports){
 'use strict';
 
 var monthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
@@ -1519,9 +2245,10 @@ var suffixes = {
   2: 'nd',
   3: 'rd',
   'default': 'th'
+};
 
-  // prototype extensions
-};var _date = {
+// prototype extensions
+var _date = {
   daysInMonth: function daysInMonth(d) {
     var feb = _date.isLeapYear(d) ? 29 : 28;
     return [31, feb, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
@@ -1700,8 +2427,7 @@ var strftime = function strftime(d, format) {
 };
 
 module.exports = strftime;
-
-},{}],20:[function(require,module,exports){
+},{}],32:[function(require,module,exports){
 'use strict';
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -1862,36 +2588,49 @@ exports.forOwn = forOwn;
 exports.assign = assign;
 exports.uniq = uniq;
 exports.stringify = stringify;
-
-},{}],21:[function(require,module,exports){
+},{}],33:[function(require,module,exports){
 'use strict';
 
-var resolve = require('resolve-url');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.extname = extname;
+exports.valid = valid;
+exports.resolve = resolve;
+
+var _resolveUrl = require('resolve-url');
+
+var _resolveUrl2 = _interopRequireDefault(_resolveUrl);
+
+var _underscore = require('./underscore');
+
+var _underscore2 = _interopRequireDefault(_underscore);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var splitPathRe = /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^/]+?|)(\.[^./]*|))(?:[/]*)$/;
 var urlRe = /^(?:\w+:)?\/\/([^\s.]+\.\S{2}|localhost[:?\d]*)\S*$/;
-var _ = require('./underscore');
 
 // https://github.com/jinder/path/blob/master/path.js#L567
-exports.extname = function (path) {
+function extname(path) {
   return splitPathRe.exec(path).slice(1)[3];
-};
+}
 
 // https://www.npmjs.com/package/is-url
-exports.valid = function (path) {
+function valid(path) {
   return urlRe.test(path);
-};
+}
 
-exports.resolve = function (root, path) {
+function resolve(root, path) {
   if (Object.prototype.toString.call(root) === '[object Array]') {
     root = root[0];
   }
-  if (root && _.last(root) !== '/') {
+  if (root && _underscore2.default.last(root) !== '/') {
     root += '/';
   }
-  return resolve(root, path);
-};
-
-},{"./underscore":20,"resolve-url":5}],22:[function(require,module,exports){
+  return (0, _resolveUrl2.default)(root, path);
+}
+},{"./underscore":32,"resolve-url":37}],34:[function(require,module,exports){
 'use strict';
 
 var _ = require('./util/underscore.js');
@@ -1941,733 +2680,58 @@ function trimRight(token, greedy) {
 }
 
 module.exports = whiteSpaceCtrl;
-
-},{"./util/underscore.js":20}],23:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var lexical = Liquid.lexical;
-var re = new RegExp('(' + lexical.identifier.source + ')\\s*=(.*)');
-var assert = require('../src/util/assert.js');
-var types = require('../src/scope').types;
-
-module.exports = function (liquid) {
-  liquid.registerTag('assign', {
-    parse: function parse(token) {
-      var match = token.args.match(re);
-      assert(match, 'illegal token ' + token.raw);
-      this.key = match[1];
-      this.value = match[2];
-    },
-    render: function render(scope) {
-      var ctx = Object.create(types.AssignScope);
-      ctx[this.key] = liquid.evalValue(this.value, scope);
-      scope.push(ctx);
-      return Promise.resolve('');
-    }
-  });
-};
-
-},{"..":2,"../src/scope":11,"../src/util/assert.js":15}],24:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var lexical = Liquid.lexical;
-var re = new RegExp('(' + lexical.identifier.source + ')');
-var assert = require('../src/util/assert.js');
-var types = require('../src/scope.js').types;
-
-module.exports = function (liquid) {
-  liquid.registerTag('capture', {
-    parse: function parse(tagToken, remainTokens) {
-      var _this = this;
-
-      var match = tagToken.args.match(re);
-      assert(match, tagToken.args + ' not valid identifier');
-
-      this.variable = match[1];
-      this.templates = [];
-
-      var stream = liquid.parser.parseStream(remainTokens);
-      stream.on('tag:endcapture', function (token) {
-        return stream.stop();
-      }).on('template', function (tpl) {
-        return _this.templates.push(tpl);
-      }).on('end', function (x) {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-      stream.start();
-    },
-    render: function render(scope, hash) {
-      var _this2 = this;
-
-      return liquid.renderer.renderTemplates(this.templates, scope).then(function (html) {
-        var ctx = Object.create(types.CaptureScope);
-        ctx[_this2.variable] = html;
-        scope.push(ctx);
-      });
-    }
-  });
-};
-
-},{"..":2,"../src/scope.js":11,"../src/util/assert.js":15}],25:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-
-module.exports = function (liquid) {
-  liquid.registerTag('case', {
-
-    parse: function parse(tagToken, remainTokens) {
-      var _this = this;
-
-      this.cond = tagToken.args;
-      this.cases = [];
-      this.elseTemplates = [];
-
-      var p = [];
-      var stream = liquid.parser.parseStream(remainTokens).on('tag:when', function (token) {
-        _this.cases.push({
-          val: token.args,
-          templates: p = []
-        });
-      }).on('tag:else', function () {
-        return p = _this.elseTemplates;
-      }).on('tag:endcase', function (token) {
-        return stream.stop();
-      }).on('template', function (tpl) {
-        return p.push(tpl);
-      }).on('end', function (x) {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-
-      stream.start();
-    },
-
-    render: function render(scope, hash) {
-      for (var i = 0; i < this.cases.length; i++) {
-        var branch = this.cases[i];
-        var val = Liquid.evalExp(branch.val, scope);
-        var cond = Liquid.evalExp(this.cond, scope);
-        if (val === cond) {
-          return liquid.renderer.renderTemplates(branch.templates, scope);
-        }
-      }
-      return liquid.renderer.renderTemplates(this.elseTemplates, scope);
-    }
-  });
-};
-
-},{"..":2}],26:[function(require,module,exports){
-'use strict';
-
-module.exports = function (liquid) {
-  liquid.registerTag('comment', {
-    parse: function parse(tagToken, remainTokens) {
-      var stream = liquid.parser.parseStream(remainTokens);
-      stream.on('token', function (token) {
-        if (token.name === 'endcomment') stream.stop();
-      }).on('end', function (x) {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-      stream.start();
-    }
-  });
-};
-
-},{}],27:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var lexical = Liquid.lexical;
-var groupRE = new RegExp('^(?:(' + lexical.value.source + ')\\s*:\\s*)?(.*)$');
-var candidatesRE = new RegExp(lexical.value.source, 'g');
-var assert = require('../src/util/assert.js');
-
-module.exports = function (liquid) {
-  liquid.registerTag('cycle', {
-
-    parse: function parse(tagToken, remainTokens) {
-      var match = groupRE.exec(tagToken.args);
-      assert(match, 'illegal tag: ' + tagToken.raw);
-
-      this.group = match[1] || '';
-      var candidates = match[2];
-
-      this.candidates = [];
-
-      while (match = candidatesRE.exec(candidates)) {
-        this.candidates.push(match[0]);
-      }
-      assert(this.candidates.length, 'empty candidates: ' + tagToken.raw);
-    },
-
-    render: function render(scope, hash) {
-      var group = Liquid.evalValue(this.group, scope);
-      var fingerprint = 'cycle:' + group + ':' + this.candidates.join(',');
-
-      var groups = scope.opts.groups = scope.opts.groups || {};
-      var idx = groups[fingerprint];
-
-      if (idx === undefined) {
-        idx = groups[fingerprint] = 0;
-      }
-
-      var candidate = this.candidates[idx];
-      idx = (idx + 1) % this.candidates.length;
-      groups[fingerprint] = idx;
-
-      return Promise.resolve(Liquid.evalValue(candidate, scope));
-    }
-  });
-};
-
-},{"..":2,"../src/util/assert.js":15}],28:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var lexical = Liquid.lexical;
-var assert = require('../src/util/assert.js');
-var types = require('../src/scope').types;
-
-module.exports = function (liquid) {
-  liquid.registerTag('decrement', {
-    parse: function parse(token) {
-      var match = token.args.match(lexical.identifier);
-      assert(match, 'illegal identifier ' + token.args);
-      this.variable = match[0];
-    },
-    render: function render(scope, hash) {
-      var context = scope.findContextFor(this.variable, function (ctx) {
-        return Object.getPrototypeOf(ctx) !== types.CaptureScope && Object.getPrototypeOf(ctx) !== types.AssignScope;
-      });
-      if (!context) {
-        context = Object.create(types.DecrementScope);
-        scope.unshift(context);
-      }
-      if (typeof context[this.variable] !== 'number') {
-        context[this.variable] = 0;
-      }
-      return --context[this.variable];
-    }
-  });
-};
-
-},{"..":2,"../src/scope":11,"../src/util/assert.js":15}],29:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var lexical = Liquid.lexical;
-var mapSeries = require('../src/util/promise.js').mapSeries;
-var _ = require('../src/util/underscore.js');
-var RenderBreakError = Liquid.Types.RenderBreakError;
-var assert = require('../src/util/assert.js');
-var re = new RegExp('^(' + lexical.identifier.source + ')\\s+in\\s+' + ('(' + lexical.value.source + ')') + ('(?:\\s+' + lexical.hash.source + ')*') + '(?:\\s+(reversed))?' + ('(?:\\s+' + lexical.hash.source + ')*$'));
-
-module.exports = function (liquid) {
-  liquid.registerTag('for', {
-
-    parse: function parse(tagToken, remainTokens) {
-      var _this = this;
-
-      var match = re.exec(tagToken.args);
-      assert(match, 'illegal tag: ' + tagToken.raw);
-      this.variable = match[1];
-      this.collection = match[2];
-      this.reversed = !!match[3];
-
-      this.templates = [];
-      this.elseTemplates = [];
-
-      var p;
-      var stream = liquid.parser.parseStream(remainTokens).on('start', function () {
-        return p = _this.templates;
-      }).on('tag:else', function () {
-        return p = _this.elseTemplates;
-      }).on('tag:endfor', function () {
-        return stream.stop();
-      }).on('template', function (tpl) {
-        return p.push(tpl);
-      }).on('end', function () {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-
-      stream.start();
-    },
-
-    render: function render(scope, hash) {
-      var _this2 = this;
-
-      var collection = Liquid.evalExp(this.collection, scope);
-
-      if (!Array.isArray(collection)) {
-        if (_.isString(collection) && collection.length > 0) {
-          collection = [collection];
-        } else if (_.isObject(collection)) {
-          collection = Object.keys(collection).map(function (key) {
-            return [key, collection[key]];
-          });
-        }
-      }
-      if (!Array.isArray(collection) || !collection.length) {
-        return liquid.renderer.renderTemplates(this.elseTemplates, scope);
-      }
-
-      var offset = hash.offset || 0;
-      var limit = hash.limit === undefined ? collection.length : hash.limit;
-
-      collection = collection.slice(offset, offset + limit);
-      if (this.reversed) collection.reverse();
-
-      var contexts = collection.map(function (item, i) {
-        var ctx = {};
-        ctx[_this2.variable] = item;
-        ctx.forloop = {
-          first: i === 0,
-          index: i + 1,
-          index0: i,
-          last: i === collection.length - 1,
-          length: collection.length,
-          rindex: collection.length - i,
-          rindex0: collection.length - i - 1
-        };
-        return ctx;
-      });
-
-      var html = '';
-      return mapSeries(contexts, function (context) {
-        return Promise.resolve().then(function () {
-          return scope.push(context);
-        }).then(function () {
-          return liquid.renderer.renderTemplates(_this2.templates, scope);
-        }).then(function (partial) {
-          return html += partial;
-        }).catch(function (e) {
-          if (e instanceof RenderBreakError) {
-            html += e.resolvedHTML;
-            if (e.message === 'continue') return;
-          }
-          throw e;
-        }).then(function () {
-          return scope.pop(context);
-        });
-      }).catch(function (e) {
-        if (e instanceof RenderBreakError && e.message === 'break') {
-          return;
-        }
-        throw e;
-      }).then(function () {
-        return html;
-      });
-    }
-  });
-};
-
-},{"..":2,"../src/util/assert.js":15,"../src/util/promise.js":18,"../src/util/underscore.js":20}],30:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-
-module.exports = function (liquid) {
-  liquid.registerTag('if', {
-
-    parse: function parse(tagToken, remainTokens) {
-      var _this = this;
-
-      this.branches = [];
-      this.elseTemplates = [];
-
-      var p;
-      var stream = liquid.parser.parseStream(remainTokens).on('start', function () {
-        return _this.branches.push({
-          cond: tagToken.args,
-          templates: p = []
-        });
-      }).on('tag:elsif', function (token) {
-        _this.branches.push({
-          cond: token.args,
-          templates: p = []
-        });
-      }).on('tag:else', function () {
-        return p = _this.elseTemplates;
-      }).on('tag:endif', function (token) {
-        return stream.stop();
-      }).on('template', function (tpl) {
-        return p.push(tpl);
-      }).on('end', function (x) {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-
-      stream.start();
-    },
-
-    render: function render(scope, hash) {
-      for (var i = 0; i < this.branches.length; i++) {
-        var branch = this.branches[i];
-        var cond = Liquid.evalExp(branch.cond, scope);
-        if (Liquid.isTruthy(cond)) {
-          return liquid.renderer.renderTemplates(branch.templates, scope);
-        }
-      }
-      return liquid.renderer.renderTemplates(this.elseTemplates, scope);
-    }
-  });
-};
-
-},{"..":2}],31:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var lexical = Liquid.lexical;
-var withRE = new RegExp('with\\s+(' + lexical.value.source + ')');
-var staticFileRE = /[^\s,]+/;
-var assert = require('../src/util/assert.js');
-
-module.exports = function (liquid) {
-  liquid.registerTag('include', {
-    parse: function parse(token) {
-      var match = staticFileRE.exec(token.args);
-      if (match) {
-        this.staticValue = match[0];
-      }
-
-      match = lexical.value.exec(token.args);
-      if (match) {
-        this.value = match[0];
-      }
-
-      match = withRE.exec(token.args);
-      if (match) {
-        this.with = match[1];
-      }
-    },
-    render: function render(scope, hash) {
-      var _this = this;
-
-      var pFilepath = void 0;
-      if (scope.opts.dynamicPartials) {
-        if (lexical.quotedLine.exec(this.value)) {
-          var template = this.value.slice(1, -1);
-          pFilepath = liquid.parseAndRender(template, scope.getAll(), scope.opts);
-        } else {
-          pFilepath = Promise.resolve(Liquid.evalValue(this.value, scope));
-        }
-      } else {
-        pFilepath = Promise.resolve(this.staticValue);
-      }
-
-      var originBlocks = scope.opts.blocks;
-      var originBlockMode = scope.opts.blockMode;
-
-      return pFilepath.then(function (filepath) {
-        assert(filepath, 'cannot include with empty filename');
-        scope.opts.blocks = {};
-        scope.opts.blockMode = 'output';
-        if (_this.with) {
-          hash[filepath] = Liquid.evalValue(_this.with, scope);
-        }
-        return liquid.getTemplate(filepath, scope.opts.root);
-      }).then(function (templates) {
-        scope.push(hash);
-        return liquid.renderer.renderTemplates(templates, scope);
-      }).then(function (html) {
-        scope.pop(hash);
-        scope.opts.blocks = originBlocks;
-        scope.opts.blockMode = originBlockMode;
-        return html;
-      });
-    }
-  });
-};
-
-},{"..":2,"../src/util/assert.js":15}],32:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var assert = require('../src/util/assert.js');
-var lexical = Liquid.lexical;
-var types = require('../src/scope').types;
-
-module.exports = function (liquid) {
-  liquid.registerTag('increment', {
-    parse: function parse(token) {
-      var match = token.args.match(lexical.identifier);
-      assert(match, 'illegal identifier ' + token.args);
-      this.variable = match[0];
-    },
-    render: function render(scope, hash) {
-      var context = scope.findContextFor(this.variable, function (ctx) {
-        return Object.getPrototypeOf(ctx) !== types.CaptureScope && Object.getPrototypeOf(ctx) !== types.AssignScope;
-      });
-      if (!context) {
-        context = Object.create(types.IncrementScope);
-        scope.unshift(context);
-      }
-      if (typeof context[this.variable] !== 'number') {
-        context[this.variable] = 0;
-      }
-      var val = context[this.variable];
-      context[this.variable]++;
-      return val;
-    }
-  });
-};
-
-},{"..":2,"../src/scope":11,"../src/util/assert.js":15}],33:[function(require,module,exports){
-'use strict';
-
-module.exports = function (engine) {
-  require('./assign.js')(engine);
-  require('./capture.js')(engine);
-  require('./case.js')(engine);
-  require('./comment.js')(engine);
-  require('./cycle.js')(engine);
-  require('./decrement.js')(engine);
-  require('./for.js')(engine);
-  require('./if.js')(engine);
-  require('./include.js')(engine);
-  require('./increment.js')(engine);
-  require('./layout.js')(engine);
-  require('./raw.js')(engine);
-  require('./tablerow.js')(engine);
-  require('./unless.js')(engine);
-};
-
-},{"./assign.js":23,"./capture.js":24,"./case.js":25,"./comment.js":26,"./cycle.js":27,"./decrement.js":28,"./for.js":29,"./if.js":30,"./include.js":31,"./increment.js":32,"./layout.js":34,"./raw.js":35,"./tablerow.js":36,"./unless.js":37}],34:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-var lexical = Liquid.lexical;
-var assert = require('../src/util/assert.js');
-var staticFileRE = /\S+/;
-
-/*
- * blockMode:
- * * "store": store rendered html into blocks
- * * "output": output rendered html
- */
-
-module.exports = function (liquid) {
-  liquid.registerTag('layout', {
-    parse: function parse(token, remainTokens) {
-      var match = staticFileRE.exec(token.args);
-      if (match) {
-        this.staticLayout = match[0];
-      }
-
-      match = lexical.value.exec(token.args);
-      if (match) {
-        this.layout = match[0];
-      }
-
-      this.tpls = liquid.parser.parse(remainTokens);
-    },
-    render: function render(scope, hash) {
-      var layout = scope.opts.dynamicPartials ? Liquid.evalValue(this.layout, scope) : this.staticLayout;
-      assert(layout, 'cannot apply layout with empty filename');
-
-      // render the remaining tokens immediately
-      scope.opts.blockMode = 'store';
-      return liquid.renderer.renderTemplates(this.tpls, scope).then(function (html) {
-        if (scope.opts.blocks[''] === undefined) {
-          scope.opts.blocks[''] = html;
-        }
-        return liquid.getTemplate(layout, scope.opts.root);
-      }).then(function (templates) {
-        scope.push(hash);
-        scope.opts.blockMode = 'output';
-        return liquid.renderer.renderTemplates(templates, scope);
-      }).then(function (partial) {
-        scope.pop(hash);
-        return partial;
-      });
-    }
-  });
-
-  liquid.registerTag('block', {
-    parse: function parse(token, remainTokens) {
-      var _this = this;
-
-      var match = /\w+/.exec(token.args);
-      this.block = match ? match[0] : '';
-
-      this.tpls = [];
-      var stream = liquid.parser.parseStream(remainTokens).on('tag:endblock', function () {
-        return stream.stop();
-      }).on('template', function (tpl) {
-        return _this.tpls.push(tpl);
-      }).on('end', function () {
-        throw new Error('tag ' + token.raw + ' not closed');
-      });
-      stream.start();
-    },
-    render: function render(scope) {
-      var _this2 = this;
-
-      return Promise.resolve(scope.opts.blocks[this.block]).then(function (html) {
-        return html === undefined
-        // render default block
-        ? liquid.renderer.renderTemplates(_this2.tpls, scope)
-        // use child-defined block
-        : html;
-      }).then(function (html) {
-        if (scope.opts.blockMode === 'store') {
-          scope.opts.blocks[_this2.block] = html;
-          return '';
-        }
-        return html;
-      });
-    }
-  });
-};
-
-},{"..":2,"../src/util/assert.js":15}],35:[function(require,module,exports){
-'use strict';
-
-module.exports = function (liquid) {
-  liquid.registerTag('raw', {
-    parse: function parse(tagToken, remainTokens) {
-      var _this = this;
-
-      this.tokens = [];
-
-      var stream = liquid.parser.parseStream(remainTokens);
-      stream.on('token', function (token) {
-        if (token.name === 'endraw') stream.stop();else _this.tokens.push(token);
-      }).on('end', function () {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-      stream.start();
-    },
-    render: function render(scope, hash) {
-      return this.tokens.map(function (token) {
-        return token.raw;
-      }).join('');
-    }
-  });
-};
+},{"./util/underscore.js":32}],35:[function(require,module,exports){
 
 },{}],36:[function(require,module,exports){
-'use strict';
+arguments[4][35][0].apply(exports,arguments)
+},{"dup":35}],37:[function(require,module,exports){
+// Copyright 2014 Simon Lydell
+// X11 (“MIT”) Licensed. (See LICENSE.)
+
+void (function(root, factory) {
+  if (typeof define === "function" && define.amd) {
+    define(factory)
+  } else if (typeof exports === "object") {
+    module.exports = factory()
+  } else {
+    root.resolveUrl = factory()
+  }
+}(this, function() {
+
+  function resolveUrl(/* ...urls */) {
+    var numUrls = arguments.length
+
+    if (numUrls === 0) {
+      throw new Error("resolveUrl requires at least one argument; got none.")
+    }
+
+    var base = document.createElement("base")
+    base.href = arguments[0]
+
+    if (numUrls === 1) {
+      return base.href
+    }
+
+    var head = document.getElementsByTagName("head")[0]
+    head.insertBefore(base, head.firstChild)
+
+    var a = document.createElement("a")
+    var resolved
+
+    for (var index = 1; index < numUrls; index++) {
+      a.href = arguments[index]
+      resolved = a.href
+      base.href = resolved
+    }
+
+    head.removeChild(base)
+
+    return resolved
+  }
+
+  return resolveUrl
+
+}));
 
-var Liquid = require('..');
-var mapSeries = require('../src/util/promise.js').mapSeries;
-var lexical = Liquid.lexical;
-var assert = require('../src/util/assert.js');
-var re = new RegExp('^(' + lexical.identifier.source + ')\\s+in\\s+' + ('(' + lexical.value.source + ')') + ('(?:\\s+' + lexical.hash.source + ')*$'));
-
-module.exports = function (liquid) {
-  liquid.registerTag('tablerow', {
-
-    parse: function parse(tagToken, remainTokens) {
-      var _this = this;
-
-      var match = re.exec(tagToken.args);
-      assert(match, 'illegal tag: ' + tagToken.raw);
-
-      this.variable = match[1];
-      this.collection = match[2];
-      this.templates = [];
-
-      var p;
-      var stream = liquid.parser.parseStream(remainTokens).on('start', function () {
-        return p = _this.templates;
-      }).on('tag:endtablerow', function (token) {
-        return stream.stop();
-      }).on('template', function (tpl) {
-        return p.push(tpl);
-      }).on('end', function () {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-
-      stream.start();
-    },
-
-    render: function render(scope, hash) {
-      var _this2 = this;
-
-      var collection = Liquid.evalExp(this.collection, scope) || [];
-
-      var html = '';
-      var offset = hash.offset || 0;
-      var limit = hash.limit === undefined ? collection.length : hash.limit;
-
-      var cols = hash.cols;
-      var row;
-      var col;
-
-      // build array of arguments to pass to sequential promises...
-      collection = collection.slice(offset, offset + limit);
-      if (!cols) cols = collection.length;
-      var contexts = collection.map(function (item, i) {
-        var ctx = {};
-        ctx[_this2.variable] = item;
-        return ctx;
-      });
-
-      return mapSeries(contexts, function (context, idx) {
-        row = Math.floor(idx / cols) + 1;
-        col = idx % cols + 1;
-        if (col === 1) {
-          if (row !== 1) {
-            html += '</tr>';
-          }
-          html += '<tr class="row' + row + '">';
-        }
-
-        html += '<td class="col' + col + '">';
-        scope.push(context);
-        return liquid.renderer.renderTemplates(_this2.templates, scope).then(function (partial) {
-          scope.pop(context);
-          html += partial;
-          html += '</td>';
-          return html;
-        });
-      }).then(function () {
-        if (row > 0) {
-          html += '</tr>';
-        }
-        return html;
-      });
-    }
-  });
-};
-
-},{"..":2,"../src/util/assert.js":15,"../src/util/promise.js":18}],37:[function(require,module,exports){
-'use strict';
-
-var Liquid = require('..');
-
-module.exports = function (liquid) {
-  liquid.registerTag('unless', {
-    parse: function parse(tagToken, remainTokens) {
-      var _this = this;
-
-      this.templates = [];
-      this.elseTemplates = [];
-      var p;
-      var stream = liquid.parser.parseStream(remainTokens).on('start', function (x) {
-        p = _this.templates;
-        _this.cond = tagToken.args;
-      }).on('tag:else', function () {
-        return p = _this.elseTemplates;
-      }).on('tag:endunless', function (token) {
-        return stream.stop();
-      }).on('template', function (tpl) {
-        return p.push(tpl);
-      }).on('end', function (x) {
-        throw new Error('tag ' + tagToken.raw + ' not closed');
-      });
-
-      stream.start();
-    },
-
-    render: function render(scope, hash) {
-      var cond = Liquid.evalExp(this.cond, scope);
-      return Liquid.isFalsy(cond) ? liquid.renderer.renderTemplates(this.templates, scope) : liquid.renderer.renderTemplates(this.elseTemplates, scope);
-    }
-  });
-};
-
-},{"..":2}]},{},[2])(2)
+},{}]},{},[3])(3)
 });
diff --git a/dist/liquid.min.js b/dist/liquid.min.js
index 42a7fdb4a..1e9bcb733 100644
--- a/dist/liquid.min.js
+++ b/dist/liquid.min.js
@@ -1 +1 @@
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).Liquid=e()}}(function(){return function i(o,u,a){function c(t,e){if(!u[t]){if(!o[t]){var r="function"==typeof require&&require;if(!e&&r)return r(t,!0);if(l)return l(t,!0);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}var s=u[t]={exports:{}};o[t][0].call(s.exports,function(e){return c(o[t][1][e]||e)},s,s.exports,i,o,u,a)}return u[t].exports}for(var l="function"==typeof require&&require,e=0;e<a.length;e++)c(a[e]);return c}({1:[function(e,t,r){"use strict";var s=e("./src/util/strftime.js"),i=e("./src/util/underscore.js"),n=e("./src/syntax.js").isTruthy,o={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&#34;","'":"&#39;"},u={"&amp;":"&","&lt;":"<","&gt;":">","&#34;":'"',"&#39;":"'"},a={abs:function(e){return Math.abs(e)},append:function(e,t){return e+t},capitalize:function(e){return f(e).charAt(0).toUpperCase()+e.slice(1)},ceil:function(e){return Math.ceil(e)},concat:function(e,t){return Array.prototype.concat.call(e,t)},date:function(e,t){var r,n=e;return"now"===e?n=new Date:i.isString(e)&&(n=new Date(e)),(r=n)instanceof Date&&!isNaN(r.getTime())?s(n,t):e},default:function(e,t){return n(e)?e:t},divided_by:function(e,t){return e/t},downcase:function(e){return e.toLowerCase()},escape:c,escape_once:function(e){return c(f(e).replace(/&(amp|lt|gt|#34|#39);/g,function(e){return u[e]}))},first:function(e){return e[0]},floor:function(e){return Math.floor(e)},join:function(e,t){return e.join(t)},last:function(e){return i.last(e)},lstrip:function(e){return f(e).replace(/^\s+/,"")},map:function(e,t){return e.map(function(e){return e[t]})},minus:p(function(e,t){return e-t}),modulo:p(function(e,t){return e%t}),newline_to_br:function(e){return e.replace(/\n/g,"<br />")},plus:p(function(e,t){return Number(e)+Number(t)}),prepend:function(e,t){return t+e},remove:function(e,t){return e.split(t).join("")},remove_first:function(e,t){return e.replace(t,"")},replace:function(e,t,r){return f(e).split(t).join(r)},replace_first:function(e,t,r){return f(e).replace(t,r)},reverse:function(e){return e.reverse()},round:function(e,t){var r=Math.pow(10,t||0);return Math.round(e*r,t)/r},rstrip:function(e){return f(e).replace(/\s+$/,"")},size:function(e){return e.length},slice:function(e,t,r){return e.substr(t,void 0===r?1:r)},sort:function(e,t){return e.sort(t)},split:function(e,t){return f(e).split(t)},strip:function(e){return f(e).trim()},strip_html:function(e){return f(e).replace(/<script.*?<\/script>|<!--.*?-->|<style.*?<\/style>|<.*?>/g,"")},strip_newlines:function(e){return f(e).replace(/\n/g,"")},times:function(e,t){return e*t},truncate:function(e,t,r){return r=void 0===r?"...":r,t=t||16,(e=f(e)).length<=t?e:e.substr(0,t-r.length)+r},truncatewords:function(e,t,r){void 0===r&&(r="...");var n=e.split(" "),s=n.slice(0,t).join(" ");return n.length>t&&(s+=r),s},uniq:function(e){var t={};return(e||[]).filter(function(e){return!t.hasOwnProperty(e)&&(t[e]=!0)})},upcase:function(e){return f(e).toUpperCase()},url_encode:encodeURIComponent};function c(e){return f(e).replace(/&|<|>|"|'/g,function(e){return o[e]})}function l(e){var t=(e+"").split(".");return 1<t.length?t[1].length:0}function f(e){return e+""}function p(i){return function(e,t){var r,n,s=(r=e,n=t,Math.max(l(r),l(n)));return i(e,t).toFixed(s)}}function h(r){return i.forOwn(a,function(e,t){return r.registerFilter(t,e)})}h.filters=a,t.exports=h},{"./src/syntax.js":12,"./src/util/strftime.js":19,"./src/util/underscore.js":20}],2:[function(e,t,r){"use strict";var s=e("./src/scope"),i=e("./src/util/underscore.js"),o=e("./src/util/assert.js"),n=e("./src/tokenizer.js"),u=e("./src/util/fs.js").statFileAsync,a=e("./src/util/fs.js").readFileAsync,c=e("path"),l=e("./src/util/url.js"),f=e("./src/render.js"),p=e("./src/lexical.js"),h=e("./src/tag.js"),g=e("./src/filter.js"),d=e("./src/parser"),v=e("./src/syntax.js"),m=e("./tags"),y=e("./filters"),j=e("./src/util/promise.js").anySeries,x=e("./src/util/error.js"),w={init:function(e,t,r){return r.cache&&(this.cache={}),this.options=r,this.tag=e,this.filter=t,this.parser=d(e,t),this.renderer=f(),m(this),y(this),this},parse:function(e,t){var r=n.parse(e,t,this.options);return this.parser.parse(r)},render:function(e,t,r){r=i.assign({},this.options,r);var n=s.factory(t,r);return this.renderer.renderTemplates(e,n)},parseAndRender:function(e,t,r){var n=this;return Promise.resolve().then(function(){return n.parse(e)}).then(function(e){return n.render(e,t,r)})},renderFile:function(e,t,r){var n=this;return r=i.assign({},r),this.getTemplate(e,r.root).then(function(e){return n.render(e,t,r)})},evalValue:function(e,t){var r=this.parser.parseValue(e.trim());return this.renderer.evalValue(r,t)},registerFilter:function(e,t){return this.filter.register(e,t)},registerTag:function(e,t){return this.tag.register(e,t)},lookup:function(t,r){r=this.options.root.concat(r||[]);var e=(r=i.uniq(r)).map(function(e){return c.resolve(e,t)});return j(e,function(e){return u(e).then(function(){return e})}).catch(function(e){throw e.message=e.code+": Failed to lookup "+t+" in: "+r,e})},getTemplate:function(e,t){return"undefined"==typeof XMLHttpRequest?this.getTemplateFromFile(e,t):this.getTemplateFromUrl(e,t)},getTemplateFromFile:function(e,t){var r=this;return c.extname(e)||(e+=this.options.extname),this.lookup(e,t).then(function(t){if(r.options.cache){var e=r.cache[t];return e?Promise.resolve(e):a(t).then(function(e){return r.parse(e)}).then(function(e){return r.cache[t]=e})}return a(t).then(function(e){return r.parse(e,t)})})},getTemplateFromUrl:function(s,e){var i,o=this;if(l.valid(s)?i=s:(l.extname(s)||(s+=this.options.extname),i=l.resolve(e||this.options.root,s)),this.options.cache){var t=this.cache[s];if(t)return Promise.resolve(t)}return new Promise(function(t,r){var n=new XMLHttpRequest;n.onload=function(){if(200<=n.status&&n.status<300){var e=o.parse(n.responseText);o.options.cache&&(o.cache[s]=e),t(e)}else r(new Error(n.statusText))},n.onerror=function(){r(new Error("An error occurred whilst sending the response."))},n.open("GET",i),n.send()})},express:function(n){n=n||{};var s=this;return function(e,t,r){o(Array.isArray(this.root)||i.isString(this.root),"illegal views root, are you using express.js?"),n.root=this.root,s.renderFile(e,t,n).then(function(e){return r(null,e)}).catch(function(e){return r(e)})}}};function b(e){var t;(e=i.assign({root:["."],cache:!1,extname:"",dynamicPartials:!0,trim_tag_right:!1,trim_tag_left:!1,trim_value_right:!1,trim_value_left:!1,greedy:!0,strict_filters:!1,strict_variables:!1},e)).root=(t=e.root,Array.isArray(t)?t:i.isString(t)?[t]:[]);var r=Object.create(w);return r.init(h(),g(e),e),r}b.lexical=p,b.isTruthy=v.isTruthy,b.isFalsy=v.isFalsy,b.evalExp=v.evalExp,b.evalValue=v.evalValue,b.Types={ParseError:x.ParseError,TokenizationEroor:x.TokenizationError,RenderBreakError:x.RenderBreakError,AssertionError:x.AssertionError},t.exports=b},{"./filters":1,"./src/filter.js":6,"./src/lexical.js":7,"./src/parser":9,"./src/render.js":10,"./src/scope":11,"./src/syntax.js":12,"./src/tag.js":13,"./src/tokenizer.js":14,"./src/util/assert.js":15,"./src/util/error.js":16,"./src/util/fs.js":17,"./src/util/promise.js":18,"./src/util/underscore.js":20,"./src/util/url.js":21,"./tags":33,path:4}],3:[function(e,t,r){},{}],4:[function(e,t,r){},{}],5:[function(e,t,r){"use strict";var n,s,i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};s=function(){return function(){var e=arguments.length;if(0===e)throw new Error("resolveUrl requires at least one argument; got none.");var t=document.createElement("base");if(t.href=arguments[0],1===e)return t.href;var r=document.getElementsByTagName("head")[0];r.insertBefore(t,r.firstChild);for(var n,s=document.createElement("a"),i=1;i<e;i++)s.href=arguments[i],n=s.href,t.href=n;return r.removeChild(t),n}},"object"===((n=void 0)===r?"undefined":i(r))?t.exports=s():n.resolveUrl=s()},{}],6:[function(e,t,r){"use strict";var l=e("./lexical.js"),n=e("./syntax.js"),f=e("./util/assert.js"),s=e("./util/underscore.js"),p=new RegExp(""+l.value.source,"g");t.exports=function(a){a=s.assign({},a);var c={},t={render:function(e,t){var r=this.args.map(function(e){return n.evalValue(e,t)});return r.unshift(e),this.filter.apply(null,r)},parse:function(e){var t=l.filterLine.exec(e);f(t,"illegal filter: "+e);var r=t[1],n=t[2]||"",s=c[r];if("function"!=typeof s){if(a.strict_filters)throw new TypeError("undefined filter: "+r);return this.name=r,this.filter=function(e){return e},this.args=[],this}for(var i=[];t=p.exec(n.trim());){var o=t[0],u=new RegExp(o+"\\s*:","g").exec(t.input);u&&u.index===t.index?i.push("'"+o+"'"):i.push(o)}return this.name=r,this.filter=s,this.args=i,this}};return{construct:function(e){return Object.create(t).parse(e)},register:function(e,t){c[e]=t},clear:function(){c={}}}}},{"./lexical.js":7,"./syntax.js":12,"./util/assert.js":15,"./util/underscore.js":20}],7:[function(e,t,r){"use strict";var n=new RegExp(/'[^']*'/.source+"|"+/"[^"]*"/.source),s=new RegExp("(?:"+n.source+"|[^'\"])*"),i=/-?\d+/,o=/-?\d+\.?\d*|\.?\d+/,u=/true|false/,a=/[\w-]+[?]?/,c=new RegExp("\\[(?:"+n.source+"|[\\w-\\.]+)\\]"),l=new RegExp("(?:"+n.source+"|"+u.source+"|"+o.source+")"),f=new RegExp(a.source+"(?:\\."+a.source+"|"+c.source+")*"),p=new RegExp("(?:"+f.source+"|"+o.source+")"),h=new RegExp("\\("+p.source+"\\.\\."+p.source+"\\)"),g=new RegExp("\\(("+p.source+")\\.\\.("+p.source+")\\)"),d=new RegExp("(?:"+f.source+"|"+l.source+"|"+h.source+")"),v=new RegExp("(?:"+a.source+")\\s*:\\s*(?:"+d.source+")"),m=new RegExp("("+a.source+")\\s*:\\s*("+d.source+")","g"),y=new RegExp("^\\s*("+a.source+")\\s*([\\s\\S]*)\\s*$"),j=new RegExp("^"+l.source+"$","i"),x=new RegExp("^"+f.source+"$"),w=new RegExp("^"+o.source+"$"),b=new RegExp("^"+u.source+"$","i"),E=new RegExp("^"+n.source+"$"),T=new RegExp("^"+g.source+"$"),S=new RegExp("^"+i.source+"$"),k=new RegExp("(?:"+a.source+"\\s*:\\s*)?"+d.source),O=new RegExp(k.source+"(\\s*,\\s*"+k.source+")*"),R=new RegExp(a.source+"(?:\\s*:\\s*"+O.source+")?","g"),_=new RegExp("("+a.source+")(?:\\s*:\\s*("+O.source+"))?"),A=new RegExp("^"+_.source+"$");t.exports={quoted:n,number:o,bool:u,literal:l,filter:R,integer:i,hash:v,hashCapture:m,range:h,rangeCapture:g,identifier:a,value:d,quoteBalanced:s,operators:[/\s+or\s+/,/\s+and\s+/,/==|!=|<=|>=|<|>|\s+contains\s+/],quotedLine:E,numberLine:w,boolLine:b,rangeLine:T,literalLine:j,filterLine:A,tagLine:y,isLiteral:function(e){return j.test(e)},isVariable:function(e){return x.test(e)},parseLiteral:function(e){var t=e.match(w);if(t)return Number(e);if(t=e.match(b))return"true"===e.toLowerCase();if(t=e.match(E))return e.slice(1,-1);throw new TypeError("cannot parse '"+e+"' as literal")},isRange:function(e){return T.test(e)},matchValue:function(e){return d.exec(e)},isInteger:function(e){return S.test(e)}}},{}],8:[function(e,t,r){"use strict";t.exports=function(r){return{"==":function(e,t){return e===t},"!=":function(e,t){return e!==t},">":function(e,t){return null!==e&&null!==t&&t<e},"<":function(e,t){return null!==e&&null!==t&&e<t},">=":function(e,t){return null!==e&&null!==t&&t<=e},"<=":function(e,t){return null!==e&&null!==t&&e<=t},contains:function(e,t){return!!e&&("function"==typeof e.indexOf&&-1<e.indexOf(t))},and:function(e,t){return r(e)&&r(t)},or:function(e,t){return r(e)||r(t)}}}},{}],9:[function(e,t,r){"use strict";var u=e("./lexical.js"),a=e("./util/error.js").ParseError,c=e("./util/assert.js");t.exports=function(r,s){var t={init:function(e){return this.tokens=e,this.handlers={},this},on:function(e,t){return this.handlers[e]=t,this},trigger:function(e,t){var r=this.handlers[e];if("function"==typeof r)return r(t),!0},start:function(){var e;for(this.trigger("start");!this.stopRequested&&(e=this.tokens.shift());)if(!(this.trigger("token",e)||"tag"===e.type&&this.trigger("tag:"+e.name,e))){var t=n(e,this.tokens);this.trigger("template",t)}return this.stopRequested||this.trigger("end"),this},stop:function(){return this.stopRequested=!0,this}};function n(t,e){try{var r=null;return(r="tag"===t.type?i(t,e):"value"===t.type?o(t.value):t).token=t,r}catch(e){throw new a(e,t)}}function i(e,t){return"continue"===e.name||"break"===e.name?e:r.construct(e,t)}function o(e){var t=u.matchValue(e);c(t,"illegal value string: "+e);var r=t[0];e=e.substr(t.index+t[0].length);for(var n=[];t=u.filter.exec(e);)n.push([t[0].trim()]);return{type:"value",initial:r,filters:n.map(function(e){return s.construct(e)})}}return{parse:function(e){for(var t,r=[];t=e.shift();)r.push(n(t,e));return r},parseTag:i,parseStream:function(e){return Object.create(t).init(e)},parseValue:o}}},{"./lexical.js":7,"./util/assert.js":15,"./util/error.js":16}],10:[function(e,t,r){"use strict";var n=e("./syntax.js"),i=e("./util/promise.js").mapSeries,o=e("./util/error.js").RenderBreakError,s=e("./util/underscore.js"),u=e("./util/error.js").RenderError,a=e("./util/assert.js"),c={renderTemplates:function(e,r){var n=this;a(r,"unable to evalTemplates: scope undefined");var s="";return i(e,function(t){return function(e){return"tag"===e.type?this.renderTag(e,r).then(function(e){return void 0===e?"":e}):"value"===e.type?this.renderValue(e,r):Promise.resolve(e.value)}.call(n,t).then(function(e){return s+=e}).catch(function(e){if(e instanceof o)throw e.resolvedHTML=s,e;throw new u(e,t)})}).then(function(){return s})},renderTag:function(e,t){return"continue"===e.name?Promise.reject(new o("continue")):"break"===e.name?Promise.reject(new o("break")):e.render(t)},renderValue:function(e,t){var r=this;return Promise.resolve().then(function(){return r.evalValue(e,t)}).then(function(e){return void 0===e?"":s.stringify(e)})},evalValue:function(e,r){return a(r,"unable to evalValue: scope undefined"),e.filters.reduce(function(e,t){return t.render(e,r)},n.evalExp(e.initial,r))}};t.exports=function(){return Object.create(c)}},{"./syntax.js":12,"./util/assert.js":15,"./util/error.js":16,"./util/promise.js":18,"./util/underscore.js":20}],11:[function(e,t,r){"use strict";var i=e("./util/underscore.js"),u=e("./lexical.js"),a=e("./util/assert.js"),n={getAll:function(){return this.contexts.reduce(function(e,t){return Object.assign(e,t)},Object.create(null))},get:function(e){var r=this,t=this.propertyAccessSeq(e),n=this.findContextFor(t[0])||i.last(this.contexts);return t.reduce(function(e,t){return r.readProperty(e,t)},n)},set:function(e,r){var n=this.propertyAccessSeq(e),s=this.findContextFor(n[0])||i.last(this.contexts);n.some(function(e,t){return!i.isObject(s)||(t===n.length-1?(s[e]=r,!0):(void 0===s[e]&&(s[e]={}),void(s=s[e])))})},unshift:function(e){return this.contexts.unshift(e)},push:function(e){return this.contexts.push(e)},pop:function(t){if(!arguments.length)return this.contexts.pop();var e=this.contexts.findIndex(function(e){return e===t});if(-1===e)throw new TypeError("scope not found, cannot pop");return this.contexts.splice(e,1)[0]},findContextFor:function(e,t){t=t||function(){return!0};for(var r=this.contexts.length-1;0<=r;r--){var n=this.contexts[r];if(t(n)&&e in n)return n}return null},readProperty:function(e,t){var r=void 0;if(i.isNil(e)?r=void 0:("function"==typeof e.to_liquid?e=e.to_liquid():"function"==typeof e.toLiquid&&(e=e.toLiquid()),r="size"===t&&(i.isArray(e)||i.isString(e))?e.length:e[t]),i.isNil(r)&&this.opts.strict_variables)throw new TypeError("undefined variable: "+t);return r},propertyAccessSeq:function(e){e=String(e);for(var t=[],r="",n=void 0,s=0;s<e.length;)switch(e[s]){case"[":o();var i=e[s+1];/['"]/.test(i)?(n=e.indexOf(i,s+2),a(-1!==n,"unbalanced "+i+": "+e),r=e.slice(s+2,n),o(),s=n+2):(n=c(e,s+1),a(-1!==n,"unbalanced []: "+e),r=e.slice(s+1,n),u.isInteger(r)||(r=this.get(r)),o(),s=n+1);break;case".":o(),s++;break;default:r+=e[s],s++}if(o(),!t.length)throw new TypeError('invalid path:"'+e+'"');return t;function o(){r.length&&t.push(r),r=""}}};function c(e,t){for(var r=1,n=t;n<e.length;n++)if("["===e[n]&&r++,"]"===e[n]&&0===--r)return n;return-1}r.factory=function(e,t){var r=Object.create(n);return r.opts=i.assign({dynamicPartials:!0,strict_variables:!1,strict_filters:!1,blocks:{},root:[]},t),r.contexts=[e||{}],r},r.types={AssignScope:Object.create(null),CaptureScope:Object.create(null),IncrementScope:Object.create(null),DecrementScope:Object.create(null)}},{"./lexical.js":7,"./util/assert.js":15,"./util/underscore.js":20}],12:[function(e,t,r){"use strict";var h=e("./operators.js")(n),g=e("./lexical.js"),d=e("../src/util/assert.js");function v(e,t){if(e=e&&e.trim()){if(g.isLiteral(e))return g.parseLiteral(e);if(g.isVariable(e))return t.get(e);throw new TypeError("cannot eval '"+e+"' as value")}}function n(e){return!s(e)}function s(e){return!1===e||null==e}t.exports={evalExp:function e(t,r){d(r,"unable to evalExp: scope undefined");for(var n,s=g.operators,i=0;i<s.length;i++){var o=s[i],u=new RegExp("^("+g.quoteBalanced.source+")("+o.source+")("+g.quoteBalanced.source+")$");if(n=t.match(u)){var a=e(n[1],r);return(0,h[n[2].trim()])(a,e(n[3],r))}}if(n=t.match(g.rangeLine)){for(var c=v(n[1],r),l=v(n[2],r),f=[],p=c;p<=l;p++)f.push(p);return f}return v(t,r)},evalValue:v,isTruthy:n,isFalsy:s}},{"../src/util/assert.js":15,"./lexical.js":7,"./operators.js":8}],13:[function(e,t,r){"use strict";var o=e("./lexical.js"),u=e("./syntax.js"),i=e("./util/assert.js");t.exports=function(){var n={},s={render:function(e){var t=function(e,t){var r={},n=void 0;for(o.hashCapture.lastIndex=0;n=o.hashCapture.exec(e);){var s=n[1],i=n[2];r[s]=u.evalValue(i,t)}return r}(this.token.args,e),r=this.tagImpl;return"function"!=typeof r.render?Promise.resolve(""):Promise.resolve().then(function(){return r.render(e,t)})},parse:function(e,t){this.type="tag",this.token=e,this.name=e.name;var r=n[this.name];i(r,"tag "+this.name+" not found"),this.tagImpl=Object.create(r),this.tagImpl.parse&&this.tagImpl.parse(e,t)}};return{construct:function(e,t){var r=Object.create(s);return r.parse(e,t),r},register:function(e,t){n[e]=t},clear:function(){n={}}}}},{"./lexical.js":7,"./syntax.js":12,"./util/assert.js":15}],14:[function(e,t,r){"use strict";var m=e("./lexical.js"),y=e("./util/error.js").TokenizationError,j=e("./util/underscore.js"),x=e("./whitespace-ctrl.js"),w=e("./util/assert.js");r.parse=function(i,o,e){w(j.isString(i),"illegal input");for(var r,n,s,t,u,a,c,l=/({%-?([\s\S]*?)-?%})|({{-?([\s\S]*?)-?}})/g,f=0,p=(r=i,n=0,s=-1,{get:function(e){var t=r.slice(s+1,e).split("\n");return n+=t.length-1,s=e,n+1}}),h=0,g=[];t=l.exec(i);h=l.lastIndex)t.index>h&&g.push(v(h,t.index)),g.push(t[1]?d(t[1],t[2].trim(),t.index):(u=t[3],a=t[4].trim(),c=t.index,{type:"value",line:p.get(c),trim_left:"{{-"===u.slice(0,3),trim_right:"-}}"===u.slice(-3),raw:u,value:a,input:i,file:o}));return i.length>h&&g.push(v(h,i.length)),x(g,e),g;function d(e,t,r){var n=t.match(m.tagLine),s={type:"tag",indent:f,line:p.get(r),trim_left:"{%-"===e.slice(0,3),trim_right:"-%}"===e.slice(-3),raw:e,value:t,input:i,file:o};if(!n)throw new y("illegal tag syntax",s);return s.name=n[1],s.args=n[2],s}function v(e,t){var r=i.slice(e,t);return f=j.last(r.split("\n")).length,{type:"html",raw:r,value:r}}},r.whiteSpaceCtrl=x},{"./lexical.js":7,"./util/assert.js":15,"./util/error.js":16,"./util/underscore.js":20,"./whitespace-ctrl.js":22}],15:[function(e,t,r){"use strict";var n=e("./error.js").AssertionError;t.exports=function(e,t){if(!e)throw new n(t=t||"expect "+e+" to be true")}},{"./error.js":16}],16:[function(e,t,r){"use strict";var a=e("./underscore.js");function c(){this.name=this.constructor.name,Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor)}function n(e,t){c.call(this),this.input=t.input,this.line=t.line,this.file=t.file;var r,s,i,n,o,u=(r=t.input,s=t.line,i=r.split("\n"),n=Math.max(s-2,1),o=Math.min(s+3,i.length),a.range(n,o+1).map(function(e){return[e===s?">> ":"   ",(t=e,r=o,n=t+"",Array((r+"").length-n.length).join(" ")+n),"| ",i[e-1]].join("");var t,r,n}).join("\n"));this.message=function(e,t){e=e||"",t.file&&(e+=", file:"+t.file);t.line&&(e+=", line:"+t.line);return e}(e.message,t),this.stack=u+"\n"+(this.stack||this.message)+(e.stack?"\nFrom "+e.stack:"")}function s(e,t){n.call(this,{message:e},t)}function i(e,t){a.assign(this,e),this.originalError=e,n.call(this,e,t)}function o(e,t){if(e instanceof o)return e;a.assign(this,e),this.originalError=e,n.call(this,e,t.token)}function u(e){c.call(this),this.message=e+""}function l(e){c.call(this),this.message=e+""}(s.prototype=Object.create(Error.prototype)).constructor=s,(i.prototype=Object.create(Error.prototype)).constructor=i,(o.prototype=Object.create(Error.prototype)).constructor=o,(u.prototype=Object.create(Error.prototype)).constructor=u,(l.prototype=Object.create(Error.prototype)).constructor=l,t.exports={TokenizationError:s,ParseError:i,RenderBreakError:u,AssertionError:l,RenderError:o}},{"./underscore.js":20}],17:[function(e,t,r){"use strict";var s=e("fs");t.exports={readFileAsync:function(e){return new Promise(function(r,n){s.readFile(e,"utf8",function(e,t){e?n(e):r(t)})})},statFileAsync:function(e){return new Promise(function(r,n){s.stat(e,function(e,t){return e?n(e):r(t)})})}}},{fs:3}],18:[function(e,t,r){"use strict";r.anySeries=function(n,s){var e=Promise.reject(new Error("init"));return n.forEach(function(t,r){e=e.catch(function(e){return s(t,r,n)})}),e},r.mapSeries=function(r,n){var s=Promise.resolve("init"),i=[];return r.forEach(function(e,t){s=s.then(function(){return n(e,t,r)}).then(function(e){return i.push(e)})}),s.then(function(){return i})}},{}],19:[function(e,t,r){"use strict";var n=["January","February","March","April","May","June","July","August","September","October","November","December"],s=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],i=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],o=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],u={1:"st",2:"nd",3:"rd",default:"th"},a={daysInMonth:function(e){return[31,a.isLeapYear(e)?29:28,31,30,31,30,31,31,30,31,30,31]},getDayOfYear:function(e){for(var t=0,r=0;r<e.getMonth();++r)t+=a.daysInMonth(e)[r];return t+e.getDate()},getWeekOfYear:function(e,t){var r=this.getDayOfYear(e)+(t-e.getDay()),n=7-new Date(e.getFullYear(),0,1).getDay()+t;return c.pad(Math.floor((r-n)/7)+1,2)},isLeapYear:function(e){var t=e.getFullYear();return!(0!=(3&t)||!(t%100||t%400==0&&t))},getSuffix:function(e){var t=e.getDate().toString(),r=parseInt(t.slice(-1));return u[r]||u.default},century:function(e){return parseInt(e.getFullYear().toString().substring(0,2),10)}},c={pad:function(e,t,r){r||(r="0");for(var n=e.toString(),s=t-n.length;0<s--;)n=r+n;return n}},l={a:function(e){return o[e.getDay()]},A:function(e){return i[e.getDay()]},b:function(e){return s[e.getMonth()]},B:function(e){return n[e.getMonth()]},c:function(e){return e.toLocaleString()},C:function(e){return a.century(e)},d:function(e){return c.pad(e.getDate(),2)},e:function(e){return c.pad(e.getDate(),2," ")},H:function(e){return c.pad(e.getHours(),2)},I:function(e){return c.pad(e.getHours()%12||12,2)},j:function(e){return c.pad(a.getDayOfYear(e),3)},k:function(e){return c.pad(e.getHours(),2," ")},l:function(e){return c.pad(e.getHours()%12||12,2," ")},L:function(e){return c.pad(e.getMilliseconds(),3)},m:function(e){return c.pad(e.getMonth()+1,2)},M:function(e){return c.pad(e.getMinutes(),2)},p:function(e){return e.getHours()<12?"AM":"PM"},P:function(e){return e.getHours()<12?"am":"pm"},q:function(e){return a.getSuffix(e)},s:function(e){return Math.round(e.valueOf()/1e3)},S:function(e){return c.pad(e.getSeconds(),2)},u:function(e){return e.getDay()||7},U:function(e){return a.getWeekOfYear(e,0)},w:function(e){return e.getDay()},W:function(e){return a.getWeekOfYear(e,1)},x:function(e){return e.toLocaleDateString()},X:function(e){return e.toLocaleTimeString()},y:function(e){return e.getFullYear().toString().substring(2,4)},Y:function(e){return e.getFullYear()},z:function(e){var t=e.getTimezoneOffset()/60*100;return(0<t?"-":"+")+c.pad(Math.abs(t),4)},"%":function(){return"%"}};l.h=l.b,l.N=l.L;t.exports=function(e,t){for(var r="",n=t;;){var s=/%./g,i=s.exec(n);if(!i)return r+n;r+=n.slice(0,s.lastIndex-2),n=n.slice(s.lastIndex);var o=i[0].charAt(1),u=l[o];r+=u?u.call(this,e):"%"+o}}},{}],20:[function(e,t,r){"use strict";var n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s=Object.prototype.toString;function i(e){return"[object String]"===s.call(e)}function o(e){return null==e}function u(e){var t=void 0===e?"undefined":n(e);return null!=e&&("object"===t||"function"===t)}r.isString=i,r.isObject=u,r.isArray=function(e){return"[object Array]"===s.call(e)},r.isNil=o,r.isError=function(e){return"Error"===Object.prototype.toString.call(e).substr(-6,5)||"string"==typeof e.message&&"string"==typeof e.name},r.range=function(e,t,r){1===arguments.length&&(t=e,e=0),r=r||1;for(var n=[],s=e;s<t;s+=r)n.push(s);return n},r.last=function(e){return e[e.length-1]},r.forOwn=function(e,t){for(var r in e=e||{})if(e.hasOwnProperty(r)&&!1===t(e[r],r,e))break;return e},r.assign=function(t){return t=u(t)?t:{},Array.prototype.slice.call(arguments,1).forEach(function(e){return Object.assign(t,e)}),t},r.uniq=function(e){for(var t={},r=[],n=0,s=e.length;n<s;++n)t.hasOwnProperty(e[n])||(r.push(e[n]),t[e[n]]=1);return r},r.stringify=function e(t){if(o(t))return String(t);if("function"==typeof t.to_liquid)return e(t.to_liquid());if("function"==typeof t.toLiquid)return e(t.toLiquid());if(i(t))return t;var r=[];return JSON.stringify(t,function(e,t){if(u(t)){if(-1!==r.indexOf(t))return;r.push(t)}return t})}},{}],21:[function(e,t,r){"use strict";var n=e("resolve-url"),s=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^/]+?|)(\.[^./]*|))(?:[/]*)$/,i=/^(?:\w+:)?\/\/([^\s.]+\.\S{2}|localhost[:?\d]*)\S*$/,o=e("./underscore");r.extname=function(e){return s.exec(e).slice(1)[3]},r.valid=function(e){return i.test(e)},r.resolve=function(e,t){return"[object Array]"===Object.prototype.toString.call(e)&&(e=e[0]),e&&"/"!==o.last(e)&&(e+="/"),n(e,t)}},{"./underscore":20,"resolve-url":5}],22:[function(e,t,r){"use strict";var n=e("./util/underscore.js");t.exports=function(o,u){u=n.assign({greedy:!0},u);var a=!1;o.forEach(function(e,t){var r,n,s,i;s=e,i=u,!a&&("tag"===s.type?s.trim_left||i.trim_tag_left:"value"===s.type?s.trim_left||i.trim_value_left:void 0)&&function(e,t){if(e&&"html"===e.type){var r=t?/\s+$/g:/[\t\r ]*$/g;e.value=e.value.replace(r,"")}}(o[t-1],u.greedy),"tag"===e.type&&"raw"===e.name&&(a=!0),"tag"===e.type&&"endraw"===e.name&&(a=!1),r=e,n=u,!a&&("tag"===r.type?r.trim_right||n.trim_tag_right:"value"===r.type?r.trim_right||n.trim_value_right:void 0)&&function(e,t){if(e&&"html"===e.type){var r=t?/^\s+/g:/^[\t\r ]*\n?/g;e.value=e.value.replace(r,"")}}(o[t+1],u.greedy)})}},{"./util/underscore.js":20}],23:[function(e,t,r){"use strict";var n=e("..").lexical,s=new RegExp("("+n.identifier.source+")\\s*=(.*)"),i=e("../src/util/assert.js"),o=e("../src/scope").types;t.exports=function(r){r.registerTag("assign",{parse:function(e){var t=e.args.match(s);i(t,"illegal token "+e.raw),this.key=t[1],this.value=t[2]},render:function(e){var t=Object.create(o.AssignScope);return t[this.key]=r.evalValue(this.value,e),e.push(t),Promise.resolve("")}})}},{"..":2,"../src/scope":11,"../src/util/assert.js":15}],24:[function(e,t,r){"use strict";var n=e("..").lexical,o=new RegExp("("+n.identifier.source+")"),u=e("../src/util/assert.js"),s=e("../src/scope.js").types;t.exports=function(i){i.registerTag("capture",{parse:function(t,e){var r=this,n=t.args.match(o);u(n,t.args+" not valid identifier"),this.variable=n[1],this.templates=[];var s=i.parser.parseStream(e);s.on("tag:endcapture",function(e){return s.stop()}).on("template",function(e){return r.templates.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")}),s.start()},render:function(r,e){var n=this;return i.renderer.renderTemplates(this.templates,r).then(function(e){var t=Object.create(s.CaptureScope);t[n.variable]=e,r.push(t)})}})}},{"..":2,"../src/scope.js":11,"../src/util/assert.js":15}],25:[function(e,t,r){"use strict";var s=e("..");t.exports=function(i){i.registerTag("case",{parse:function(t,e){var r=this;this.cond=t.args,this.cases=[],this.elseTemplates=[];var n=[],s=i.parser.parseStream(e).on("tag:when",function(e){r.cases.push({val:e.args,templates:n=[]})}).on("tag:else",function(){return n=r.elseTemplates}).on("tag:endcase",function(e){return s.stop()}).on("template",function(e){return n.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")});s.start()},render:function(e,t){for(var r=0;r<this.cases.length;r++){var n=this.cases[r];if(s.evalExp(n.val,e)===s.evalExp(this.cond,e))return i.renderer.renderTemplates(n.templates,e)}return i.renderer.renderTemplates(this.elseTemplates,e)}})}},{"..":2}],26:[function(e,t,r){"use strict";t.exports=function(n){n.registerTag("comment",{parse:function(t,e){var r=n.parser.parseStream(e);r.on("token",function(e){"endcomment"===e.name&&r.stop()}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")}),r.start()}})}},{}],27:[function(e,t,r){"use strict";var o=e(".."),n=o.lexical,s=new RegExp("^(?:("+n.value.source+")\\s*:\\s*)?(.*)$"),i=new RegExp(n.value.source,"g"),u=e("../src/util/assert.js");t.exports=function(e){e.registerTag("cycle",{parse:function(e,t){var r=s.exec(e.args);u(r,"illegal tag: "+e.raw),this.group=r[1]||"";var n=r[2];for(this.candidates=[];r=i.exec(n);)this.candidates.push(r[0]);u(this.candidates.length,"empty candidates: "+e.raw)},render:function(e,t){var r="cycle:"+o.evalValue(this.group,e)+":"+this.candidates.join(","),n=e.opts.groups=e.opts.groups||{},s=n[r];void 0===s&&(s=n[r]=0);var i=this.candidates[s];return s=(s+1)%this.candidates.length,n[r]=s,Promise.resolve(o.evalValue(i,e))}})}},{"..":2,"../src/util/assert.js":15}],28:[function(e,t,r){"use strict";var n=e("..").lexical,s=e("../src/util/assert.js"),i=e("../src/scope").types;t.exports=function(e){e.registerTag("decrement",{parse:function(e){var t=e.args.match(n.identifier);s(t,"illegal identifier "+e.args),this.variable=t[0]},render:function(e,t){var r=e.findContextFor(this.variable,function(e){return Object.getPrototypeOf(e)!==i.CaptureScope&&Object.getPrototypeOf(e)!==i.AssignScope});return r||(r=Object.create(i.DecrementScope),e.unshift(r)),"number"!=typeof r[this.variable]&&(r[this.variable]=0),--r[this.variable]}})}},{"..":2,"../src/scope":11,"../src/util/assert.js":15}],29:[function(e,t,r){"use strict";var c=e(".."),n=c.lexical,l=e("../src/util/promise.js").mapSeries,f=e("../src/util/underscore.js"),p=c.Types.RenderBreakError,o=e("../src/util/assert.js"),u=new RegExp("^("+n.identifier.source+")\\s+in\\s+("+n.value.source+")(?:\\s+"+n.hash.source+")*(?:\\s+(reversed))?(?:\\s+"+n.hash.source+")*$");t.exports=function(a){a.registerTag("for",{parse:function(e,t){var r,n=this,s=u.exec(e.args);o(s,"illegal tag: "+e.raw),this.variable=s[1],this.collection=s[2],this.reversed=!!s[3],this.templates=[],this.elseTemplates=[];var i=a.parser.parseStream(t).on("start",function(){return r=n.templates}).on("tag:else",function(){return r=n.elseTemplates}).on("tag:endfor",function(){return i.stop()}).on("template",function(e){return r.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")});i.start()},render:function(t,e){var n=this,s=c.evalExp(this.collection,t);if(Array.isArray(s)||(f.isString(s)&&0<s.length?s=[s]:f.isObject(s)&&(s=Object.keys(s).map(function(e){return[e,s[e]]}))),!Array.isArray(s)||!s.length)return a.renderer.renderTemplates(this.elseTemplates,t);var r=e.offset||0,i=void 0===e.limit?s.length:e.limit;s=s.slice(r,r+i),this.reversed&&s.reverse();var o=s.map(function(e,t){var r={};return r[n.variable]=e,r.forloop={first:0===t,index:t+1,index0:t,last:t===s.length-1,length:s.length,rindex:s.length-t,rindex0:s.length-t-1},r}),u="";return l(o,function(e){return Promise.resolve().then(function(){return t.push(e)}).then(function(){return a.renderer.renderTemplates(n.templates,t)}).then(function(e){return u+=e}).catch(function(e){if(!(e instanceof p&&(u+=e.resolvedHTML,"continue"===e.message)))throw e}).then(function(){return t.pop(e)})}).catch(function(e){if(!(e instanceof p&&"break"===e.message))throw e}).then(function(){return u})}})}},{"..":2,"../src/util/assert.js":15,"../src/util/promise.js":18,"../src/util/underscore.js":20}],30:[function(e,t,r){"use strict";var o=e("..");t.exports=function(i){i.registerTag("if",{parse:function(t,e){var r,n=this;this.branches=[],this.elseTemplates=[];var s=i.parser.parseStream(e).on("start",function(){return n.branches.push({cond:t.args,templates:r=[]})}).on("tag:elsif",function(e){n.branches.push({cond:e.args,templates:r=[]})}).on("tag:else",function(){return r=n.elseTemplates}).on("tag:endif",function(e){return s.stop()}).on("template",function(e){return r.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")});s.start()},render:function(e,t){for(var r=0;r<this.branches.length;r++){var n=this.branches[r],s=o.evalExp(n.cond,e);if(o.isTruthy(s))return i.renderer.renderTemplates(n.templates,e)}return i.renderer.renderTemplates(this.elseTemplates,e)}})}},{"..":2}],31:[function(e,t,r){"use strict";var a=e(".."),c=a.lexical,n=new RegExp("with\\s+("+c.value.source+")"),s=/[^\s,]+/,l=e("../src/util/assert.js");t.exports=function(u){u.registerTag("include",{parse:function(e){var t=s.exec(e.args);t&&(this.staticValue=t[0]),(t=c.value.exec(e.args))&&(this.value=t[0]),(t=n.exec(e.args))&&(this.with=t[1])},render:function(t,r){var n=this,e=void 0;if(t.opts.dynamicPartials)if(c.quotedLine.exec(this.value)){var s=this.value.slice(1,-1);e=u.parseAndRender(s,t.getAll(),t.opts)}else e=Promise.resolve(a.evalValue(this.value,t));else e=Promise.resolve(this.staticValue);var i=t.opts.blocks,o=t.opts.blockMode;return e.then(function(e){return l(e,"cannot include with empty filename"),t.opts.blocks={},t.opts.blockMode="output",n.with&&(r[e]=a.evalValue(n.with,t)),u.getTemplate(e,t.opts.root)}).then(function(e){return t.push(r),u.renderer.renderTemplates(e,t)}).then(function(e){return t.pop(r),t.opts.blocks=i,t.opts.blockMode=o,e})}})}},{"..":2,"../src/util/assert.js":15}],32:[function(e,t,r){"use strict";var n=e(".."),s=e("../src/util/assert.js"),i=n.lexical,o=e("../src/scope").types;t.exports=function(e){e.registerTag("increment",{parse:function(e){var t=e.args.match(i.identifier);s(t,"illegal identifier "+e.args),this.variable=t[0]},render:function(e,t){var r=e.findContextFor(this.variable,function(e){return Object.getPrototypeOf(e)!==o.CaptureScope&&Object.getPrototypeOf(e)!==o.AssignScope});r||(r=Object.create(o.IncrementScope),e.unshift(r)),"number"!=typeof r[this.variable]&&(r[this.variable]=0);var n=r[this.variable];return r[this.variable]++,n}})}},{"..":2,"../src/scope":11,"../src/util/assert.js":15}],33:[function(t,e,r){"use strict";e.exports=function(e){t("./assign.js")(e),t("./capture.js")(e),t("./case.js")(e),t("./comment.js")(e),t("./cycle.js")(e),t("./decrement.js")(e),t("./for.js")(e),t("./if.js")(e),t("./include.js")(e),t("./increment.js")(e),t("./layout.js")(e),t("./raw.js")(e),t("./tablerow.js")(e),t("./unless.js")(e)}},{"./assign.js":23,"./capture.js":24,"./case.js":25,"./comment.js":26,"./cycle.js":27,"./decrement.js":28,"./for.js":29,"./if.js":30,"./include.js":31,"./increment.js":32,"./layout.js":34,"./raw.js":35,"./tablerow.js":36,"./unless.js":37}],34:[function(e,t,r){"use strict";var s=e(".."),n=s.lexical,o=e("../src/util/assert.js"),u=/\S+/;t.exports=function(i){i.registerTag("layout",{parse:function(e,t){var r=u.exec(e.args);r&&(this.staticLayout=r[0]),(r=n.value.exec(e.args))&&(this.layout=r[0]),this.tpls=i.parser.parse(t)},render:function(t,r){var n=t.opts.dynamicPartials?s.evalValue(this.layout,t):this.staticLayout;return o(n,"cannot apply layout with empty filename"),t.opts.blockMode="store",i.renderer.renderTemplates(this.tpls,t).then(function(e){return void 0===t.opts.blocks[""]&&(t.opts.blocks[""]=e),i.getTemplate(n,t.opts.root)}).then(function(e){return t.push(r),t.opts.blockMode="output",i.renderer.renderTemplates(e,t)}).then(function(e){return t.pop(r),e})}}),i.registerTag("block",{parse:function(e,t){var r=this,n=/\w+/.exec(e.args);this.block=n?n[0]:"",this.tpls=[];var s=i.parser.parseStream(t).on("tag:endblock",function(){return s.stop()}).on("template",function(e){return r.tpls.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")});s.start()},render:function(t){var r=this;return Promise.resolve(t.opts.blocks[this.block]).then(function(e){return void 0===e?i.renderer.renderTemplates(r.tpls,t):e}).then(function(e){return"store"===t.opts.blockMode?(t.opts.blocks[r.block]=e,""):e})}})}},{"..":2,"../src/util/assert.js":15}],35:[function(e,t,r){"use strict";t.exports=function(s){s.registerTag("raw",{parse:function(e,t){var r=this;this.tokens=[];var n=s.parser.parseStream(t);n.on("token",function(e){"endraw"===e.name?n.stop():r.tokens.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")}),n.start()},render:function(e,t){return this.tokens.map(function(e){return e.raw}).join("")}})}},{}],36:[function(e,t,r){"use strict";var p=e(".."),h=e("../src/util/promise.js").mapSeries,n=p.lexical,o=e("../src/util/assert.js"),u=new RegExp("^("+n.identifier.source+")\\s+in\\s+("+n.value.source+")(?:\\s+"+n.hash.source+")*$");t.exports=function(f){f.registerTag("tablerow",{parse:function(e,t){var r,n=this,s=u.exec(e.args);o(s,"illegal tag: "+e.raw),this.variable=s[1],this.collection=s[2],this.templates=[];var i=f.parser.parseStream(t).on("start",function(){return r=n.templates}).on("tag:endtablerow",function(e){return i.stop()}).on("template",function(e){return r.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")});i.start()},render:function(r,e){var n,s,i=this,t=p.evalExp(this.collection,r)||[],o="",u=e.offset||0,a=void 0===e.limit?t.length:e.limit,c=e.cols;t=t.slice(u,u+a),c||(c=t.length);var l=t.map(function(e,t){var r={};return r[i.variable]=e,r});return h(l,function(t,e){return n=Math.floor(e/c)+1,1===(s=e%c+1)&&(1!==n&&(o+="</tr>"),o+='<tr class="row'+n+'">'),o+='<td class="col'+s+'">',r.push(t),f.renderer.renderTemplates(i.templates,r).then(function(e){return r.pop(t),o+=e,o+="</td>"})}).then(function(){return 0<n&&(o+="</tr>"),o})}})}},{"..":2,"../src/util/assert.js":15,"../src/util/promise.js":18}],37:[function(e,t,r){"use strict";var n=e("..");t.exports=function(i){i.registerTag("unless",{parse:function(t,e){var r,n=this;this.templates=[],this.elseTemplates=[];var s=i.parser.parseStream(e).on("start",function(e){r=n.templates,n.cond=t.args}).on("tag:else",function(){return r=n.elseTemplates}).on("tag:endunless",function(e){return s.stop()}).on("template",function(e){return r.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")});s.start()},render:function(e,t){var r=n.evalExp(this.cond,e);return n.isFalsy(r)?i.renderer.renderTemplates(this.templates,e):i.renderer.renderTemplates(this.elseTemplates,e)}})}},{"..":2}]},{},[2])(2)});
\ No newline at end of file
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).Liquid=e()}}(function(){return function i(o,u,a){function c(t,e){if(!u[t]){if(!o[t]){var r="function"==typeof require&&require;if(!e&&r)return r(t,!0);if(l)return l(t,!0);var n=new Error("Cannot find module '"+t+"'");throw n.code="MODULE_NOT_FOUND",n}var s=u[t]={exports:{}};o[t][0].call(s.exports,function(e){return c(o[t][1][e]||e)},s,s.exports,i,o,u,a)}return u[t].exports}for(var l="function"==typeof require&&require,e=0;e<a.length;e++)c(a[e]);return c}({1:[function(e,t,r){"use strict";var l=e("./lexical.js"),n=e("./syntax.js"),f=e("./util/assert.js"),s=e("./util/underscore.js"),p=new RegExp(""+l.value.source,"g");t.exports=function(a){a=s.assign({},a);var c={},t={render:function(e,t){var r=this.args.map(function(e){return n.evalValue(e,t)});return r.unshift(e),this.filter.apply(null,r)},parse:function(e){var t=l.filterLine.exec(e);f(t,"illegal filter: "+e);var r=t[1],n=t[2]||"",s=c[r];if("function"!=typeof s){if(a.strict_filters)throw new TypeError("undefined filter: "+r);return this.name=r,this.filter=function(e){return e},this.args=[],this}for(var i=[];t=p.exec(n.trim());){var o=t[0],u=new RegExp(o+"\\s*:","g").exec(t.input);u&&u.index===t.index?i.push("'"+o+"'"):i.push(o)}return this.name=r,this.filter=s,this.args=i,this}};return{construct:function(e){return Object.create(t).parse(e)},register:function(e,t){c[e]=t},clear:function(){c={}}}}},{"./lexical.js":4,"./syntax.js":9,"./util/assert.js":27,"./util/underscore.js":32}],2:[function(e,t,r){"use strict";var s=e("./util/strftime.js"),i=e("./util/underscore.js"),n=e("./syntax.js").isTruthy,o={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&#34;","'":"&#39;"},u={"&amp;":"&","&lt;":"<","&gt;":">","&#34;":'"',"&#39;":"'"},a={abs:function(e){return Math.abs(e)},append:function(e,t){return e+t},capitalize:function(e){return f(e).charAt(0).toUpperCase()+e.slice(1)},ceil:function(e){return Math.ceil(e)},concat:function(e,t){return Array.prototype.concat.call(e,t)},date:function(e,t){var r,n=e;return"now"===e?n=new Date:i.isString(e)&&(n=new Date(e)),(r=n)instanceof Date&&!isNaN(r.getTime())?s(n,t):e},default:function(e,t){return n(e)?e:t},divided_by:function(e,t){return e/t},downcase:function(e){return e.toLowerCase()},escape:c,escape_once:function(e){return c(f(e).replace(/&(amp|lt|gt|#34|#39);/g,function(e){return u[e]}))},first:function(e){return e[0]},floor:function(e){return Math.floor(e)},join:function(e,t){return e.join(t)},last:function(e){return i.last(e)},lstrip:function(e){return f(e).replace(/^\s+/,"")},map:function(e,t){return e.map(function(e){return e[t]})},minus:p(function(e,t){return e-t}),modulo:p(function(e,t){return e%t}),newline_to_br:function(e){return e.replace(/\n/g,"<br />")},plus:p(function(e,t){return Number(e)+Number(t)}),prepend:function(e,t){return t+e},remove:function(e,t){return e.split(t).join("")},remove_first:function(e,t){return e.replace(t,"")},replace:function(e,t,r){return f(e).split(t).join(r)},replace_first:function(e,t,r){return f(e).replace(t,r)},reverse:function(e){return e.reverse()},round:function(e,t){var r=Math.pow(10,t||0);return Math.round(e*r,t)/r},rstrip:function(e){return f(e).replace(/\s+$/,"")},size:function(e){return e.length},slice:function(e,t,r){return e.substr(t,void 0===r?1:r)},sort:function(e,t){return e.sort(t)},split:function(e,t){return f(e).split(t)},strip:function(e){return f(e).trim()},strip_html:function(e){return f(e).replace(/<script.*?<\/script>|<!--.*?-->|<style.*?<\/style>|<.*?>/g,"")},strip_newlines:function(e){return f(e).replace(/\n/g,"")},times:function(e,t){return e*t},truncate:function(e,t,r){return r=void 0===r?"...":r,t=t||16,(e=f(e)).length<=t?e:e.substr(0,t-r.length)+r},truncatewords:function(e,t,r){void 0===r&&(r="...");var n=e.split(" "),s=n.slice(0,t).join(" ");return n.length>t&&(s+=r),s},uniq:function(e){var t={};return(e||[]).filter(function(e){return!t.hasOwnProperty(e)&&(t[e]=!0)})},upcase:function(e){return f(e).toUpperCase()},url_encode:encodeURIComponent};function c(e){return f(e).replace(/&|<|>|"|'/g,function(e){return o[e]})}function l(e){var t=(e+"").split(".");return 1<t.length?t[1].length:0}function f(e){return e+""}function p(i){return function(e,t){var r,n,s=(r=e,n=t,Math.max(l(r),l(n)));return i(e,t).toFixed(s)}}function h(r){return i.forOwn(a,function(e,t){return r.registerFilter(t,e)})}h.filters=a,t.exports=h},{"./syntax.js":9,"./util/strftime.js":31,"./util/underscore.js":32}],3:[function(e,t,r){"use strict";var s=x(e("./scope")),i=x(e("./util/underscore.js")),o=x(e("./util/assert.js")),n=x(e("./tokenizer.js")),u=e("./util/fs.js"),a=x(e("path")),c=e("./util/url.js"),l=x(e("./lexical.js")),f=x(e("./render.js")),p=x(e("./tag.js")),h=x(e("./filter.js")),d=x(e("./parser")),g=e("./syntax.js"),v=x(e("./tags")),m=x(e("./filters")),y=e("./util/promise.js"),j=x(e("./util/error.js"));function x(e){return e&&e.__esModule?e:{default:e}}var w={init:function(e,t,r){return r.cache&&(this.cache={}),this.options=r,this.tag=e,this.filter=t,this.parser=(0,d.default)(e,t),this.renderer=(0,f.default)(),(0,v.default)(this),(0,m.default)(this),this},parse:function(e,t){var r=n.default.parse(e,t,this.options);return this.parser.parse(r)},render:function(e,t,r){r=i.default.assign({},this.options,r);var n=s.default.factory(t,r);return this.renderer.renderTemplates(e,n)},parseAndRender:function(e,t,r){var n=this;return Promise.resolve().then(function(){return n.parse(e)}).then(function(e){return n.render(e,t,r)})},renderFile:function(e,t,r){var n=this;return r=i.default.assign({},r),this.getTemplate(e,r.root).then(function(e){return n.render(e,t,r)})},evalValue:function(e,t){var r=this.parser.parseValue(e.trim());return this.renderer.evalValue(r,t)},registerFilter:function(e,t){return this.filter.register(e,t)},registerTag:function(e,t){return this.tag.register(e,t)},lookup:function(t,r){r=this.options.root.concat(r||[]);var e=(r=i.default.uniq(r)).map(function(e){return a.default.resolve(e,t)});return(0,y.anySeries)(e,function(e){return(0,u.statFileAsync)(e).then(function(){return e})}).catch(function(e){throw e.message=e.code+": Failed to lookup "+t+" in: "+r,e})},getTemplate:function(e,t){return"undefined"==typeof XMLHttpRequest?this.getTemplateFromFile(e,t):this.getTemplateFromUrl(e,t)},getTemplateFromFile:function(e,t){var r=this;return a.default.extname(e)||(e+=this.options.extname),this.lookup(e,t).then(function(t){if(r.options.cache){var e=r.cache[t];return e?Promise.resolve(e):(0,u.readFileAsync)(t).then(function(e){return r.parse(e)}).then(function(e){return r.cache[t]=e})}return(0,u.readFileAsync)(t).then(function(e){return r.parse(e,t)})})},getTemplateFromUrl:function(s,e){var i=this,o=void 0;if((0,c.valid)(s)?o=s:((0,c.extname)(s)||(s+=this.options.extname),o=(0,c.resolve)(e||this.options.root,s)),this.options.cache){var t=this.cache[s];if(t)return Promise.resolve(t)}return new Promise(function(t,r){var n=new XMLHttpRequest;n.onload=function(){if(200<=n.status&&n.status<300){var e=i.parse(n.responseText);i.options.cache&&(i.cache[s]=e),t(e)}else r(new Error(n.statusText))},n.onerror=function(){r(new Error("An error occurred whilst sending the response."))},n.open("GET",o),n.send()})},express:function(n){n=n||{};var s=this;return function(e,t,r){(0,o.default)(Array.isArray(this.root)||i.default.isString(this.root),"illegal views root, are you using express.js?"),n.root=this.root,s.renderFile(e,t,n).then(function(e){return r(null,e)}).catch(function(e){return r(e)})}}};function b(e){var t;(e=i.default.assign({root:["."],cache:!1,extname:"",dynamicPartials:!0,trim_tag_right:!1,trim_tag_left:!1,trim_value_right:!1,trim_value_left:!1,greedy:!0,strict_filters:!1,strict_variables:!1},e)).root=(t=e.root,Array.isArray(t)?t:i.default.isString(t)?[t]:[]);var r=Object.create(w);return r.init((0,p.default)(),(0,h.default)(e),e),r}var E={ParseError:j.default.ParseError,TokenizationEroor:j.default.TokenizationError,RenderBreakError:j.default.RenderBreakError,AssertionError:j.default.AssertionError};b.isTruthy=g.isTruthy,b.isFalsy=g.isFalsy,b.evalExp=g.evalExp,b.evalValue=g.evalValue,b.Types=E,b.lexical=l.default,t.exports=b},{"./filter.js":1,"./filters":2,"./lexical.js":4,"./parser":6,"./render.js":7,"./scope":8,"./syntax.js":9,"./tag.js":10,"./tags":21,"./tokenizer.js":26,"./util/assert.js":27,"./util/error.js":28,"./util/fs.js":29,"./util/promise.js":30,"./util/underscore.js":32,"./util/url.js":33,path:36}],4:[function(e,t,r){"use strict";var n=new RegExp(/'[^']*'/.source+"|"+/"[^"]*"/.source),s=new RegExp("(?:"+n.source+"|[^'\"])*"),i=/-?\d+/,o=/-?\d+\.?\d*|\.?\d+/,u=/true|false/,a=/[\w-]+[?]?/,c=new RegExp("\\[(?:"+n.source+"|[\\w-\\.]+)\\]"),l=new RegExp("(?:"+n.source+"|"+u.source+"|"+o.source+")"),f=new RegExp(a.source+"(?:\\."+a.source+"|"+c.source+")*"),p=new RegExp("(?:"+f.source+"|"+o.source+")"),h=new RegExp("\\("+p.source+"\\.\\."+p.source+"\\)"),d=new RegExp("\\(("+p.source+")\\.\\.("+p.source+")\\)"),g=new RegExp("(?:"+f.source+"|"+l.source+"|"+h.source+")"),v=new RegExp("(?:"+a.source+")\\s*:\\s*(?:"+g.source+")"),m=new RegExp("("+a.source+")\\s*:\\s*("+g.source+")","g"),y=new RegExp("^\\s*("+a.source+")\\s*([\\s\\S]*)\\s*$"),j=new RegExp("^"+l.source+"$","i"),x=new RegExp("^"+f.source+"$"),w=new RegExp("^"+o.source+"$"),b=new RegExp("^"+u.source+"$","i"),E=new RegExp("^"+n.source+"$"),T=new RegExp("^"+d.source+"$"),S=new RegExp("^"+i.source+"$"),k=new RegExp("(?:"+a.source+"\\s*:\\s*)?"+g.source),_=new RegExp(k.source+"(\\s*,\\s*"+k.source+")*"),O=new RegExp(a.source+"(?:\\s*:\\s*"+_.source+")?","g"),M=new RegExp("("+a.source+")(?:\\s*:\\s*("+_.source+"))?"),R=new RegExp("^"+M.source+"$");t.exports={quoted:n,number:o,bool:u,literal:l,filter:O,integer:i,hash:v,hashCapture:m,range:h,rangeCapture:d,identifier:a,value:g,quoteBalanced:s,operators:[/\s+or\s+/,/\s+and\s+/,/==|!=|<=|>=|<|>|\s+contains\s+/],quotedLine:E,numberLine:w,boolLine:b,rangeLine:T,literalLine:j,filterLine:R,tagLine:y,isLiteral:function(e){return j.test(e)},isVariable:function(e){return x.test(e)},parseLiteral:function(e){var t=e.match(w);if(t)return Number(e);if(t=e.match(b))return"true"===e.toLowerCase();if(t=e.match(E))return e.slice(1,-1);throw new TypeError("cannot parse '"+e+"' as literal")},isRange:function(e){return T.test(e)},matchValue:function(e){return g.exec(e)},isInteger:function(e){return S.test(e)}}},{}],5:[function(e,t,r){"use strict";t.exports=function(r){return{"==":function(e,t){return e===t},"!=":function(e,t){return e!==t},">":function(e,t){return null!==e&&null!==t&&t<e},"<":function(e,t){return null!==e&&null!==t&&e<t},">=":function(e,t){return null!==e&&null!==t&&t<=e},"<=":function(e,t){return null!==e&&null!==t&&e<=t},contains:function(e,t){return!!e&&("function"==typeof e.indexOf&&-1<e.indexOf(t))},and:function(e,t){return r(e)&&r(t)},or:function(e,t){return r(e)||r(t)}}}},{}],6:[function(e,t,r){"use strict";var u=e("./lexical.js"),a=e("./util/error.js").ParseError,c=e("./util/assert.js");t.exports=function(r,s){var t={init:function(e){return this.tokens=e,this.handlers={},this},on:function(e,t){return this.handlers[e]=t,this},trigger:function(e,t){var r=this.handlers[e];if("function"==typeof r)return r(t),!0},start:function(){this.trigger("start");for(var e=void 0;!this.stopRequested&&(e=this.tokens.shift());)if(!(this.trigger("token",e)||"tag"===e.type&&this.trigger("tag:"+e.name,e))){var t=n(e,this.tokens);this.trigger("template",t)}return this.stopRequested||this.trigger("end"),this},stop:function(){return this.stopRequested=!0,this}};function n(t,e){try{var r=null;return(r="tag"===t.type?i(t,e):"value"===t.type?o(t.value):t).token=t,r}catch(e){throw new a(e,t)}}function i(e,t){return"continue"===e.name||"break"===e.name?e:r.construct(e,t)}function o(e){var t=u.matchValue(e);c(t,"illegal value string: "+e);var r=t[0];e=e.substr(t.index+t[0].length);for(var n=[];t=u.filter.exec(e);)n.push([t[0].trim()]);return{type:"value",initial:r,filters:n.map(function(e){return s.construct(e)})}}return{parse:function(e){for(var t=void 0,r=[];t=e.shift();)r.push(n(t,e));return r},parseTag:i,parseStream:function(e){return Object.create(t).init(e)},parseValue:o}}},{"./lexical.js":4,"./util/assert.js":27,"./util/error.js":28}],7:[function(e,t,r){"use strict";var n=e("./syntax.js"),i=e("./util/promise.js").mapSeries,o=e("./util/error.js").RenderBreakError,s=e("./util/underscore.js"),u=e("./util/error.js").RenderError,a=e("./util/assert.js"),c={renderTemplates:function(e,r){var n=this;a(r,"unable to evalTemplates: scope undefined");var s="";return i(e,function(t){return function(e){return"tag"===e.type?this.renderTag(e,r).then(function(e){return void 0===e?"":e}):"value"===e.type?this.renderValue(e,r):Promise.resolve(e.value)}.call(n,t).then(function(e){return s+=e}).catch(function(e){if(e instanceof o)throw e.resolvedHTML=s,e;throw new u(e,t)})}).then(function(){return s})},renderTag:function(e,t){return"continue"===e.name?Promise.reject(new o("continue")):"break"===e.name?Promise.reject(new o("break")):e.render(t)},renderValue:function(e,t){var r=this;return Promise.resolve().then(function(){return r.evalValue(e,t)}).then(function(e){return void 0===e?"":s.stringify(e)})},evalValue:function(e,r){return a(r,"unable to evalValue: scope undefined"),e.filters.reduce(function(e,t){return t.render(e,r)},n.evalExp(e.initial,r))}};t.exports=function(){return Object.create(c)}},{"./syntax.js":9,"./util/assert.js":27,"./util/error.js":28,"./util/promise.js":30,"./util/underscore.js":32}],8:[function(e,t,r){"use strict";var i=e("./util/underscore.js"),u=e("./lexical.js"),a=e("./util/assert.js"),n={getAll:function(){return this.contexts.reduce(function(e,t){return Object.assign(e,t)},Object.create(null))},get:function(e){var r=this,t=this.propertyAccessSeq(e),n=this.findContextFor(t[0])||i.last(this.contexts);return t.reduce(function(e,t){return r.readProperty(e,t)},n)},set:function(e,r){var n=this.propertyAccessSeq(e),s=this.findContextFor(n[0])||i.last(this.contexts);n.some(function(e,t){return!i.isObject(s)||(t===n.length-1?(s[e]=r,!0):(void 0===s[e]&&(s[e]={}),void(s=s[e])))})},unshift:function(e){return this.contexts.unshift(e)},push:function(e){return this.contexts.push(e)},pop:function(t){if(!arguments.length)return this.contexts.pop();var e=this.contexts.findIndex(function(e){return e===t});if(-1===e)throw new TypeError("scope not found, cannot pop");return this.contexts.splice(e,1)[0]},findContextFor:function(e,t){t=t||function(){return!0};for(var r=this.contexts.length-1;0<=r;r--){var n=this.contexts[r];if(t(n)&&e in n)return n}return null},readProperty:function(e,t){var r=void 0;if(i.isNil(e)?r=void 0:("function"==typeof e.to_liquid?e=e.to_liquid():"function"==typeof e.toLiquid&&(e=e.toLiquid()),r="size"===t&&(i.isArray(e)||i.isString(e))?e.length:e[t]),i.isNil(r)&&this.opts.strict_variables)throw new TypeError("undefined variable: "+t);return r},propertyAccessSeq:function(e){e=String(e);for(var t=[],r="",n=void 0,s=0;s<e.length;)switch(e[s]){case"[":o();var i=e[s+1];/['"]/.test(i)?(n=e.indexOf(i,s+2),a(-1!==n,"unbalanced "+i+": "+e),r=e.slice(s+2,n),o(),s=n+2):(n=c(e,s+1),a(-1!==n,"unbalanced []: "+e),r=e.slice(s+1,n),u.isInteger(r)||(r=this.get(r)),o(),s=n+1);break;case".":o(),s++;break;default:r+=e[s],s++}if(o(),!t.length)throw new TypeError('invalid path:"'+e+'"');return t;function o(){r.length&&t.push(r),r=""}}};function c(e,t){for(var r=1,n=t;n<e.length;n++)if("["===e[n]&&r++,"]"===e[n]&&0===--r)return n;return-1}r.factory=function(e,t){var r=Object.create(n);return r.opts=i.assign({dynamicPartials:!0,strict_variables:!1,strict_filters:!1,blocks:{},root:[]},t),r.contexts=[e||{}],r},r.types={AssignScope:Object.create(null),CaptureScope:Object.create(null),IncrementScope:Object.create(null),DecrementScope:Object.create(null)}},{"./lexical.js":4,"./util/assert.js":27,"./util/underscore.js":32}],9:[function(e,t,r){"use strict";var h=e("./operators.js")(n),d=e("./lexical.js"),g=e("./util/assert.js");function v(e,t){if(e=e&&e.trim()){if(d.isLiteral(e))return d.parseLiteral(e);if(d.isVariable(e))return t.get(e);throw new TypeError("cannot eval '"+e+"' as value")}}function n(e){return!s(e)}function s(e){return!1===e||null==e}t.exports={evalExp:function e(t,r){g(r,"unable to evalExp: scope undefined");for(var n=d.operators,s=void 0,i=0;i<n.length;i++){var o=n[i],u=new RegExp("^("+d.quoteBalanced.source+")("+o.source+")("+d.quoteBalanced.source+")$");if(s=t.match(u)){var a=e(s[1],r);return(0,h[s[2].trim()])(a,e(s[3],r))}}if(s=t.match(d.rangeLine)){for(var c=v(s[1],r),l=v(s[2],r),f=[],p=c;p<=l;p++)f.push(p);return f}return v(t,r)},evalValue:v,isTruthy:n,isFalsy:s}},{"./lexical.js":4,"./operators.js":5,"./util/assert.js":27}],10:[function(e,t,r){"use strict";var o=e("./lexical.js"),u=e("./syntax.js"),i=e("./util/assert.js");t.exports=function(){var n={},s={render:function(e){var t=function(e,t){var r={},n=void 0;for(o.hashCapture.lastIndex=0;n=o.hashCapture.exec(e);){var s=n[1],i=n[2];r[s]=u.evalValue(i,t)}return r}(this.token.args,e),r=this.tagImpl;return"function"!=typeof r.render?Promise.resolve(""):Promise.resolve().then(function(){return r.render(e,t)})},parse:function(e,t){this.type="tag",this.token=e,this.name=e.name;var r=n[this.name];i(r,"tag "+this.name+" not found"),this.tagImpl=Object.create(r),this.tagImpl.parse&&this.tagImpl.parse(e,t)}};return{construct:function(e,t){var r=Object.create(s);return r.parse(e,t),r},register:function(e,t){n[e]=t},clear:function(){n={}}}}},{"./lexical.js":4,"./syntax.js":9,"./util/assert.js":27}],11:[function(e,t,r){"use strict";var n,s=e("../index"),i=e("../util/assert.js"),o=(n=i)&&n.__esModule?n:{default:n},u=e("../scope");var a=new RegExp("("+s.lexical.identifier.source+")\\s*=(.*)");t.exports=function(r){r.registerTag("assign",{parse:function(e){var t=e.args.match(a);(0,o.default)(t,"illegal token "+e.raw),this.key=t[1],this.value=t[2]},render:function(e){var t=Object.create(u.types.AssignScope);return t[this.key]=r.evalValue(this.value,e),e.push(t),Promise.resolve("")}})}},{"../index":3,"../scope":8,"../util/assert.js":27}],12:[function(e,t,r){"use strict";var n=e("..").lexical,o=new RegExp("("+n.identifier.source+")"),u=e("../util/assert.js"),s=e("../scope.js").types;t.exports=function(i){i.registerTag("capture",{parse:function(t,e){var r=this,n=t.args.match(o);u(n,t.args+" not valid identifier"),this.variable=n[1],this.templates=[];var s=i.parser.parseStream(e);s.on("tag:endcapture",function(e){return s.stop()}).on("template",function(e){return r.templates.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")}),s.start()},render:function(r,e){var n=this;return i.renderer.renderTemplates(this.templates,r).then(function(e){var t=Object.create(s.CaptureScope);t[n.variable]=e,r.push(t)})}})}},{"..":3,"../scope.js":8,"../util/assert.js":27}],13:[function(e,t,r){"use strict";var n,s=e(".."),o=(n=s)&&n.__esModule?n:{default:n};t.exports=function(i){i.registerTag("case",{parse:function(t,e){var r=this;this.cond=t.args,this.cases=[],this.elseTemplates=[];var n=[],s=i.parser.parseStream(e).on("tag:when",function(e){r.cases.push({val:e.args,templates:n=[]})}).on("tag:else",function(){return n=r.elseTemplates}).on("tag:endcase",function(e){return s.stop()}).on("template",function(e){return n.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")});s.start()},render:function(e,t){for(var r=0;r<this.cases.length;r++){var n=this.cases[r];if(o.default.evalExp(n.val,e)===o.default.evalExp(this.cond,e))return i.renderer.renderTemplates(n.templates,e)}return i.renderer.renderTemplates(this.elseTemplates,e)}})}},{"..":3}],14:[function(e,t,r){"use strict";t.exports=function(n){n.registerTag("comment",{parse:function(t,e){var r=n.parser.parseStream(e);r.on("token",function(e){"endcomment"===e.name&&r.stop()}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")}),r.start()}})}},{}],15:[function(e,t,r){"use strict";var o=e(".."),n=o.lexical,s=new RegExp("^(?:("+n.value.source+")\\s*:\\s*)?(.*)$"),i=new RegExp(n.value.source,"g"),u=e("../util/assert.js");t.exports=function(e){e.registerTag("cycle",{parse:function(e,t){var r=s.exec(e.args);u(r,"illegal tag: "+e.raw),this.group=r[1]||"";var n=r[2];for(this.candidates=[];r=i.exec(n);)this.candidates.push(r[0]);u(this.candidates.length,"empty candidates: "+e.raw)},render:function(e,t){var r="cycle:"+o.evalValue(this.group,e)+":"+this.candidates.join(","),n=e.opts.groups=e.opts.groups||{},s=n[r];void 0===s&&(s=n[r]=0);var i=this.candidates[s];return s=(s+1)%this.candidates.length,n[r]=s,Promise.resolve(o.evalValue(i,e))}})}},{"..":3,"../util/assert.js":27}],16:[function(e,t,r){"use strict";var n=e("..").lexical,s=e("../util/assert.js"),i=e("../scope").types;t.exports=function(e){e.registerTag("decrement",{parse:function(e){var t=e.args.match(n.identifier);s(t,"illegal identifier "+e.args),this.variable=t[0]},render:function(e,t){var r=e.findContextFor(this.variable,function(e){return Object.getPrototypeOf(e)!==i.CaptureScope&&Object.getPrototypeOf(e)!==i.AssignScope});return r||(r=Object.create(i.DecrementScope),e.unshift(r)),"number"!=typeof r[this.variable]&&(r[this.variable]=0),--r[this.variable]}})}},{"..":3,"../scope":8,"../util/assert.js":27}],17:[function(e,t,r){"use strict";var n=e("../index"),c=s(n),l=e("../util/promise.js"),f=s(e("../util/underscore.js")),o=s(e("../util/assert.js"));function s(e){return e&&e.__esModule?e:{default:e}}var p=c.default.Types.RenderBreakError,u=new RegExp("^("+n.lexical.identifier.source+")\\s+in\\s+("+n.lexical.value.source+")(?:\\s+"+n.lexical.hash.source+")*(?:\\s+(reversed))?(?:\\s+"+n.lexical.hash.source+")*$");t.exports=function(a){a.registerTag("for",{parse:function(e,t){var r=this,n=u.exec(e.args);(0,o.default)(n,"illegal tag: "+e.raw),this.variable=n[1],this.collection=n[2],this.reversed=!!n[3],this.templates=[],this.elseTemplates=[];var s=void 0,i=a.parser.parseStream(t).on("start",function(){return s=r.templates}).on("tag:else",function(){return s=r.elseTemplates}).on("tag:endfor",function(){return i.stop()}).on("template",function(e){return s.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")});i.start()},render:function(t,e){var n=this,s=c.default.evalExp(this.collection,t);if(Array.isArray(s)||(f.default.isString(s)&&0<s.length?s=[s]:f.default.isObject(s)&&(s=Object.keys(s).map(function(e){return[e,s[e]]}))),!Array.isArray(s)||!s.length)return a.renderer.renderTemplates(this.elseTemplates,t);var r=e.offset||0,i=void 0===e.limit?s.length:e.limit;s=s.slice(r,r+i),this.reversed&&s.reverse();var o=s.map(function(e,t){var r={};return r[n.variable]=e,r.forloop={first:0===t,index:t+1,index0:t,last:t===s.length-1,length:s.length,rindex:s.length-t,rindex0:s.length-t-1},r}),u="";return(0,l.mapSeries)(o,function(e){return Promise.resolve().then(function(){return t.push(e)}).then(function(){return a.renderer.renderTemplates(n.templates,t)}).then(function(e){return u+=e}).catch(function(e){if(!(e instanceof p&&(u+=e.resolvedHTML,"continue"===e.message)))throw e}).then(function(){return t.pop(e)})}).catch(function(e){if(!(e instanceof p&&"break"===e.message))throw e}).then(function(){return u})}})}},{"../index":3,"../util/assert.js":27,"../util/promise.js":30,"../util/underscore.js":32}],18:[function(e,t,r){"use strict";var n,s=e(".."),o=(n=s)&&n.__esModule?n:{default:n};t.exports=function(i){i.registerTag("if",{parse:function(t,e){var r=this;this.branches=[],this.elseTemplates=[];var n=void 0,s=i.parser.parseStream(e).on("start",function(){return r.branches.push({cond:t.args,templates:n=[]})}).on("tag:elsif",function(e){r.branches.push({cond:e.args,templates:n=[]})}).on("tag:else",function(){return n=r.elseTemplates}).on("tag:endif",function(e){return s.stop()}).on("template",function(e){return n.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")});s.start()},render:function(e,t){for(var r=0;r<this.branches.length;r++){var n=this.branches[r],s=o.default.evalExp(n.cond,e);if(o.default.isTruthy(s))return i.renderer.renderTemplates(n.templates,e)}return i.renderer.renderTemplates(this.elseTemplates,e)}})}},{"..":3}],19:[function(e,t,r){"use strict";var a=e(".."),c=a.lexical,n=new RegExp("with\\s+("+c.value.source+")"),s=/[^\s,]+/,l=e("../util/assert.js");t.exports=function(u){u.registerTag("include",{parse:function(e){var t=s.exec(e.args);t&&(this.staticValue=t[0]),(t=c.value.exec(e.args))&&(this.value=t[0]),(t=n.exec(e.args))&&(this.with=t[1])},render:function(t,r){var n=this,e=void 0;if(t.opts.dynamicPartials)if(c.quotedLine.exec(this.value)){var s=this.value.slice(1,-1);e=u.parseAndRender(s,t.getAll(),t.opts)}else e=Promise.resolve(a.evalValue(this.value,t));else e=Promise.resolve(this.staticValue);var i=t.opts.blocks,o=t.opts.blockMode;return e.then(function(e){return l(e,"cannot include with empty filename"),t.opts.blocks={},t.opts.blockMode="output",n.with&&(r[e]=a.evalValue(n.with,t)),u.getTemplate(e,t.opts.root)}).then(function(e){return t.push(r),u.renderer.renderTemplates(e,t)}).then(function(e){return t.pop(r),t.opts.blocks=i,t.opts.blockMode=o,e})}})}},{"..":3,"../util/assert.js":27}],20:[function(e,t,r){"use strict";var n=e(".."),s=e("../util/assert.js"),i=n.lexical,o=e("../scope").types;t.exports=function(e){e.registerTag("increment",{parse:function(e){var t=e.args.match(i.identifier);s(t,"illegal identifier "+e.args),this.variable=t[0]},render:function(e,t){var r=e.findContextFor(this.variable,function(e){return Object.getPrototypeOf(e)!==o.CaptureScope&&Object.getPrototypeOf(e)!==o.AssignScope});r||(r=Object.create(o.IncrementScope),e.unshift(r)),"number"!=typeof r[this.variable]&&(r[this.variable]=0);var n=r[this.variable];return r[this.variable]++,n}})}},{"..":3,"../scope":8,"../util/assert.js":27}],21:[function(t,e,r){"use strict";e.exports=function(e){t("./assign.js")(e),t("./capture.js")(e),t("./case.js")(e),t("./comment.js")(e),t("./cycle.js")(e),t("./decrement.js")(e),t("./for.js")(e),t("./if.js")(e),t("./include.js")(e),t("./increment.js")(e),t("./layout.js")(e),t("./raw.js")(e),t("./tablerow.js")(e),t("./unless.js")(e)}},{"./assign.js":11,"./capture.js":12,"./case.js":13,"./comment.js":14,"./cycle.js":15,"./decrement.js":16,"./for.js":17,"./if.js":18,"./include.js":19,"./increment.js":20,"./layout.js":22,"./raw.js":23,"./tablerow.js":24,"./unless.js":25}],22:[function(e,t,r){"use strict";var s=e(".."),n=s.lexical,o=e("../util/assert.js"),u=/\S+/;t.exports=function(i){i.registerTag("layout",{parse:function(e,t){var r=u.exec(e.args);r&&(this.staticLayout=r[0]),(r=n.value.exec(e.args))&&(this.layout=r[0]),this.tpls=i.parser.parse(t)},render:function(t,r){var n=t.opts.dynamicPartials?s.evalValue(this.layout,t):this.staticLayout;return o(n,"cannot apply layout with empty filename"),t.opts.blockMode="store",i.renderer.renderTemplates(this.tpls,t).then(function(e){return void 0===t.opts.blocks[""]&&(t.opts.blocks[""]=e),i.getTemplate(n,t.opts.root)}).then(function(e){return t.push(r),t.opts.blockMode="output",i.renderer.renderTemplates(e,t)}).then(function(e){return t.pop(r),e})}}),i.registerTag("block",{parse:function(e,t){var r=this,n=/\w+/.exec(e.args);this.block=n?n[0]:"",this.tpls=[];var s=i.parser.parseStream(t).on("tag:endblock",function(){return s.stop()}).on("template",function(e){return r.tpls.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")});s.start()},render:function(t){var r=this;return Promise.resolve(t.opts.blocks[this.block]).then(function(e){return void 0===e?i.renderer.renderTemplates(r.tpls,t):e}).then(function(e){return"store"===t.opts.blockMode?(t.opts.blocks[r.block]=e,""):e})}})}},{"..":3,"../util/assert.js":27}],23:[function(e,t,r){"use strict";t.exports=function(s){s.registerTag("raw",{parse:function(e,t){var r=this;this.tokens=[];var n=s.parser.parseStream(t);n.on("token",function(e){"endraw"===e.name?n.stop():r.tokens.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")}),n.start()},render:function(e,t){return this.tokens.map(function(e){return e.raw}).join("")}})}},{}],24:[function(e,t,r){"use strict";var p=n(e("..")),h=e("../util/promise.js"),o=n(e("../util/assert.js"));function n(e){return e&&e.__esModule?e:{default:e}}var s=p.default.lexical,u=new RegExp("^("+s.identifier.source+")\\s+in\\s+("+s.value.source+")(?:\\s+"+s.hash.source+")*$");t.exports=function(f){f.registerTag("tablerow",{parse:function(e,t){var r=this,n=u.exec(e.args);(0,o.default)(n,"illegal tag: "+e.raw),this.variable=n[1],this.collection=n[2],this.templates=[];var s=void 0,i=f.parser.parseStream(t).on("start",function(){return s=r.templates}).on("tag:endtablerow",function(e){return i.stop()}).on("template",function(e){return s.push(e)}).on("end",function(){throw new Error("tag "+e.raw+" not closed")});i.start()},render:function(r,e){var n=this,t=p.default.evalExp(this.collection,r)||[],s="",i=e.offset||0,o=void 0===e.limit?t.length:e.limit,u=e.cols,a=void 0,c=void 0;t=t.slice(i,i+o),u||(u=t.length);var l=t.map(function(e,t){var r={};return r[n.variable]=e,r});return(0,h.mapSeries)(l,function(t,e){return a=Math.floor(e/u)+1,1===(c=e%u+1)&&(1!==a&&(s+="</tr>"),s+='<tr class="row'+a+'">'),s+='<td class="col'+c+'">',r.push(t),f.renderer.renderTemplates(n.templates,r).then(function(e){return r.pop(t),s+=e,s+="</td>"})}).then(function(){return 0<a&&(s+="</tr>"),s})}})}},{"..":3,"../util/assert.js":27,"../util/promise.js":30}],25:[function(e,t,r){"use strict";var n,s=e("../index"),o=(n=s)&&n.__esModule?n:{default:n};t.exports=function(i){i.registerTag("unless",{parse:function(t,e){var r=this;this.templates=[],this.elseTemplates=[];var n=void 0,s=i.parser.parseStream(e).on("start",function(e){n=r.templates,r.cond=t.args}).on("tag:else",function(){return n=r.elseTemplates}).on("tag:endunless",function(e){return s.stop()}).on("template",function(e){return n.push(e)}).on("end",function(e){throw new Error("tag "+t.raw+" not closed")});s.start()},render:function(e,t){var r=o.default.evalExp(this.cond,e);return o.default.isFalsy(r)?i.renderer.renderTemplates(this.templates,e):i.renderer.renderTemplates(this.elseTemplates,e)}})}},{"../index":3}],26:[function(e,t,r){"use strict";var m=e("./lexical.js"),y=e("./util/error.js").TokenizationError,j=e("./util/underscore.js"),x=e("./whitespace-ctrl.js"),w=e("./util/assert.js");r.parse=function(i,o,e){w(j.isString(i),"illegal input");for(var r,n,s,t,u,a,c,l=/({%-?([\s\S]*?)-?%})|({{-?([\s\S]*?)-?}})/g,f=0,p=(r=i,n=0,s=-1,{get:function(e){var t=r.slice(s+1,e).split("\n");return n+=t.length-1,s=e,n+1}}),h=0,d=[];t=l.exec(i);h=l.lastIndex)t.index>h&&d.push(v(h,t.index)),d.push(t[1]?g(t[1],t[2].trim(),t.index):(u=t[3],a=t[4].trim(),c=t.index,{type:"value",line:p.get(c),trim_left:"{{-"===u.slice(0,3),trim_right:"-}}"===u.slice(-3),raw:u,value:a,input:i,file:o}));return i.length>h&&d.push(v(h,i.length)),x(d,e),d;function g(e,t,r){var n=t.match(m.tagLine),s={type:"tag",indent:f,line:p.get(r),trim_left:"{%-"===e.slice(0,3),trim_right:"-%}"===e.slice(-3),raw:e,value:t,input:i,file:o};if(!n)throw new y("illegal tag syntax",s);return s.name=n[1],s.args=n[2],s}function v(e,t){var r=i.slice(e,t);return f=j.last(r.split("\n")).length,{type:"html",raw:r,value:r}}},r.whiteSpaceCtrl=x},{"./lexical.js":4,"./util/assert.js":27,"./util/error.js":28,"./util/underscore.js":32,"./whitespace-ctrl.js":34}],27:[function(e,t,r){"use strict";var n=e("./error.js").AssertionError;t.exports=function(e,t){if(!e)throw new n(t=t||"expect "+e+" to be true")}},{"./error.js":28}],28:[function(e,t,r){"use strict";var n,s=e("./underscore.js"),a=(n=s)&&n.__esModule?n:{default:n};function c(){this.name=this.constructor.name,Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor)}function i(e,t){c.call(this),this.input=t.input,this.line=t.line,this.file=t.file;var r,s,i,n,o,u=(r=t.input,s=t.line,i=r.split("\n"),n=Math.max(s-2,1),o=Math.min(s+3,i.length),a.default.range(n,o+1).map(function(e){return[e===s?">> ":"   ",(t=e,r=o,n=t+"",Array((r+"").length-n.length).join(" ")+n),"| ",i[e-1]].join("");var t,r,n}).join("\n"));this.message=function(e,t){e=e||"",t.file&&(e+=", file:"+t.file);t.line&&(e+=", line:"+t.line);return e}(e.message,t),this.stack=u+"\n"+(this.stack||this.message)+(e.stack?"\nFrom "+e.stack:"")}function o(e,t){i.call(this,{message:e},t)}function u(e,t){a.default.assign(this,e),this.originalError=e,i.call(this,e,t)}function l(e,t){if(e instanceof l)return e;a.default.assign(this,e),this.originalError=e,i.call(this,e,t.token)}function f(e){c.call(this),this.message=e+""}function p(e){c.call(this),this.message=e+""}(o.prototype=Object.create(Error.prototype)).constructor=o,(u.prototype=Object.create(Error.prototype)).constructor=u,(l.prototype=Object.create(Error.prototype)).constructor=l,(f.prototype=Object.create(Error.prototype)).constructor=f,(p.prototype=Object.create(Error.prototype)).constructor=p,t.exports={TokenizationError:o,ParseError:u,RenderBreakError:f,AssertionError:p,RenderError:l}},{"./underscore.js":32}],29:[function(e,t,r){"use strict";var s=e("fs");t.exports={readFileAsync:function(e){return new Promise(function(r,n){s.readFile(e,"utf8",function(e,t){e?n(e):r(t)})})},statFileAsync:function(e){return new Promise(function(r,n){s.stat(e,function(e,t){return e?n(e):r(t)})})}}},{fs:35}],30:[function(e,t,r){"use strict";r.anySeries=function(n,s){var e=Promise.reject(new Error("init"));return n.forEach(function(t,r){e=e.catch(function(e){return s(t,r,n)})}),e},r.mapSeries=function(r,n){var s=Promise.resolve("init"),i=[];return r.forEach(function(e,t){s=s.then(function(){return n(e,t,r)}).then(function(e){return i.push(e)})}),s.then(function(){return i})}},{}],31:[function(e,t,r){"use strict";var n=["January","February","March","April","May","June","July","August","September","October","November","December"],s=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],i=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],o=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],u={1:"st",2:"nd",3:"rd",default:"th"},a={daysInMonth:function(e){return[31,a.isLeapYear(e)?29:28,31,30,31,30,31,31,30,31,30,31]},getDayOfYear:function(e){for(var t=0,r=0;r<e.getMonth();++r)t+=a.daysInMonth(e)[r];return t+e.getDate()},getWeekOfYear:function(e,t){var r=this.getDayOfYear(e)+(t-e.getDay()),n=7-new Date(e.getFullYear(),0,1).getDay()+t;return c.pad(Math.floor((r-n)/7)+1,2)},isLeapYear:function(e){var t=e.getFullYear();return!(0!=(3&t)||!(t%100||t%400==0&&t))},getSuffix:function(e){var t=e.getDate().toString(),r=parseInt(t.slice(-1));return u[r]||u.default},century:function(e){return parseInt(e.getFullYear().toString().substring(0,2),10)}},c={pad:function(e,t,r){r||(r="0");for(var n=e.toString(),s=t-n.length;0<s--;)n=r+n;return n}},l={a:function(e){return o[e.getDay()]},A:function(e){return i[e.getDay()]},b:function(e){return s[e.getMonth()]},B:function(e){return n[e.getMonth()]},c:function(e){return e.toLocaleString()},C:function(e){return a.century(e)},d:function(e){return c.pad(e.getDate(),2)},e:function(e){return c.pad(e.getDate(),2," ")},H:function(e){return c.pad(e.getHours(),2)},I:function(e){return c.pad(e.getHours()%12||12,2)},j:function(e){return c.pad(a.getDayOfYear(e),3)},k:function(e){return c.pad(e.getHours(),2," ")},l:function(e){return c.pad(e.getHours()%12||12,2," ")},L:function(e){return c.pad(e.getMilliseconds(),3)},m:function(e){return c.pad(e.getMonth()+1,2)},M:function(e){return c.pad(e.getMinutes(),2)},p:function(e){return e.getHours()<12?"AM":"PM"},P:function(e){return e.getHours()<12?"am":"pm"},q:function(e){return a.getSuffix(e)},s:function(e){return Math.round(e.valueOf()/1e3)},S:function(e){return c.pad(e.getSeconds(),2)},u:function(e){return e.getDay()||7},U:function(e){return a.getWeekOfYear(e,0)},w:function(e){return e.getDay()},W:function(e){return a.getWeekOfYear(e,1)},x:function(e){return e.toLocaleDateString()},X:function(e){return e.toLocaleTimeString()},y:function(e){return e.getFullYear().toString().substring(2,4)},Y:function(e){return e.getFullYear()},z:function(e){var t=e.getTimezoneOffset()/60*100;return(0<t?"-":"+")+c.pad(Math.abs(t),4)},"%":function(){return"%"}};l.h=l.b,l.N=l.L;t.exports=function(e,t){for(var r="",n=t;;){var s=/%./g,i=s.exec(n);if(!i)return r+n;r+=n.slice(0,s.lastIndex-2),n=n.slice(s.lastIndex);var o=i[0].charAt(1),u=l[o];r+=u?u.call(this,e):"%"+o}}},{}],32:[function(e,t,r){"use strict";var n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},s=Object.prototype.toString;function i(e){return"[object String]"===s.call(e)}function o(e){return null==e}function u(e){var t=void 0===e?"undefined":n(e);return null!=e&&("object"===t||"function"===t)}r.isString=i,r.isObject=u,r.isArray=function(e){return"[object Array]"===s.call(e)},r.isNil=o,r.isError=function(e){return"Error"===Object.prototype.toString.call(e).substr(-6,5)||"string"==typeof e.message&&"string"==typeof e.name},r.range=function(e,t,r){1===arguments.length&&(t=e,e=0),r=r||1;for(var n=[],s=e;s<t;s+=r)n.push(s);return n},r.last=function(e){return e[e.length-1]},r.forOwn=function(e,t){for(var r in e=e||{})if(e.hasOwnProperty(r)&&!1===t(e[r],r,e))break;return e},r.assign=function(t){return t=u(t)?t:{},Array.prototype.slice.call(arguments,1).forEach(function(e){return Object.assign(t,e)}),t},r.uniq=function(e){for(var t={},r=[],n=0,s=e.length;n<s;++n)t.hasOwnProperty(e[n])||(r.push(e[n]),t[e[n]]=1);return r},r.stringify=function e(t){if(o(t))return String(t);if("function"==typeof t.to_liquid)return e(t.to_liquid());if("function"==typeof t.toLiquid)return e(t.toLiquid());if(i(t))return t;var r=[];return JSON.stringify(t,function(e,t){if(u(t)){if(-1!==r.indexOf(t))return;r.push(t)}return t})}},{}],33:[function(e,t,r){"use strict";Object.defineProperty(r,"__esModule",{value:!0}),r.extname=function(e){return o.exec(e).slice(1)[3]},r.valid=function(e){return u.test(e)},r.resolve=function(e,t){"[object Array]"===Object.prototype.toString.call(e)&&(e=e[0]);e&&"/"!==s.default.last(e)&&(e+="/");return(0,n.default)(e,t)};var n=i(e("resolve-url")),s=i(e("./underscore"));function i(e){return e&&e.__esModule?e:{default:e}}var o=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^/]+?|)(\.[^./]*|))(?:[/]*)$/,u=/^(?:\w+:)?\/\/([^\s.]+\.\S{2}|localhost[:?\d]*)\S*$/},{"./underscore":32,"resolve-url":37}],34:[function(e,t,r){"use strict";var n=e("./util/underscore.js");t.exports=function(o,u){u=n.assign({greedy:!0},u);var a=!1;o.forEach(function(e,t){var r,n,s,i;s=e,i=u,!a&&("tag"===s.type?s.trim_left||i.trim_tag_left:"value"===s.type?s.trim_left||i.trim_value_left:void 0)&&function(e,t){if(e&&"html"===e.type){var r=t?/\s+$/g:/[\t\r ]*$/g;e.value=e.value.replace(r,"")}}(o[t-1],u.greedy),"tag"===e.type&&"raw"===e.name&&(a=!0),"tag"===e.type&&"endraw"===e.name&&(a=!1),r=e,n=u,!a&&("tag"===r.type?r.trim_right||n.trim_tag_right:"value"===r.type?r.trim_right||n.trim_value_right:void 0)&&function(e,t){if(e&&"html"===e.type){var r=t?/^\s+/g:/^[\t\r ]*\n?/g;e.value=e.value.replace(r,"")}}(o[t+1],u.greedy)})}},{"./util/underscore.js":32}],35:[function(e,t,r){},{}],36:[function(e,t,r){arguments[4][35][0].apply(r,arguments)},{dup:35}],37:[function(e,t,r){var n,s;n=this,s=function(){return function(){var e=arguments.length;if(0===e)throw new Error("resolveUrl requires at least one argument; got none.");var t=document.createElement("base");if(t.href=arguments[0],1===e)return t.href;var r=document.getElementsByTagName("head")[0];r.insertBefore(t,r.firstChild);for(var n,s=document.createElement("a"),i=1;i<e;i++)s.href=arguments[i],n=s.href,t.href=n;return r.removeChild(t),n}},"object"==typeof r?t.exports=s():n.resolveUrl=s()},{}]},{},[3])(3)});
\ No newline at end of file
diff --git a/package.json b/package.json
index 2170371c4..3dc7a24f7 100644
--- a/package.json
+++ b/package.json
@@ -2,15 +2,19 @@
   "name": "liquidjs",
   "version": "5.2.0",
   "description": "Liquid template engine by pure JavaScript: compatible to shopify, easy to extend.",
-  "main": "src/index.js",
+  "main": "dist/index.js",
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha --recursive",
-    "coverage": "cross-env NODE_ENV=test istanbul cover --report html ./node_modules/mocha/bin/_mocha -- -R spec --recursive",
-    "lcov": "cross-env NODE_ENV=test istanbul cover --report lcovonly ./node_modules/mocha/bin/_mocha -- -R spec --recursive",
-    "dist": "npm run browserify && npm run uglify",
-    "browserify": "browserify index.js -s Liquid --ignore path -t [ babelify --global true --presets [ es2015 ] ] > dist/liquid.js",
+    "test": "mocha --require babel-core/register --recursive",
+    "coverage": "nyc report --require babel-core/register mocha test/ --recursive ",
+    "coveralls": "nyc report --reporter=text-lcov --require babel-core/register mocha test/ --recursive | coveralls",
+    "dist": "npm run babelify && npm run browserify && npm run uglify",
+    "babelify": "babel src -d dist",
+    "browserify": "browserify dist/index.js -s Liquid --ignore path --global true > dist/liquid.js",
     "uglify": "uglifyjs dist/liquid.js --compress warnings=false --mangle --output dist/liquid.min.js",
+    "demo:browser": "echo open http://localhost:8080/demo/browser && http-server",
+    "demo:nodejs": "node ./demo/nodejs/index.js",
+    "demo:express": "cd ./demo/express/ && npm start",
     "preversion": "npm run lint && npm test",
     "version": "npm run dist && git add -A dist",
     "postversion": "git push && git push --tags"
@@ -42,7 +46,7 @@
     "fs": false
   },
   "devDependencies": {
-    "babel-core": "^6.26.0",
+    "babel-core": "^6.26.3",
     "babel-preset-es2015": "^6.24.1",
     "babelify": "^8.0.0",
     "browserify": "^16.2.2",
@@ -58,10 +62,12 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
     "express": "^4.16.1",
+    "http-server": "^0.11.1",
     "istanbul": "^0.4.5",
     "jsdom": "^11.5.1",
     "mocha": "^5.2.0",
     "mock-fs": "^4.4.1",
+    "nyc": "^12.0.2",
     "sinon": "^6.1.4",
     "sinon-chai": "^3.2.0",
     "supertest": "^3.0.0",
diff --git a/src/filter.js b/src/filter.js
index 0e7810a43..45f5ee9cf 100644
--- a/src/filter.js
+++ b/src/filter.js
@@ -3,25 +3,25 @@ const Syntax = require('./syntax.js')
 const assert = require('./util/assert.js')
 const _ = require('./util/underscore.js')
 
-var valueRE = new RegExp(`${lexical.value.source}`, 'g')
+let valueRE = new RegExp(`${lexical.value.source}`, 'g')
 
 module.exports = function (options) {
   options = _.assign({}, options)
-  var filters = {}
+  let filters = {}
 
-  var _filterInstance = {
+  let _filterInstance = {
     render: function (output, scope) {
-      var args = this.args.map(arg => Syntax.evalValue(arg, scope))
+      let args = this.args.map(arg => Syntax.evalValue(arg, scope))
       args.unshift(output)
       return this.filter.apply(null, args)
     },
     parse: function (str) {
-      var match = lexical.filterLine.exec(str)
+      let match = lexical.filterLine.exec(str)
       assert(match, 'illegal filter: ' + str)
 
-      var name = match[1]
-      var argList = match[2] || ''
-      var filter = filters[name]
+      let name = match[1]
+      let argList = match[2] || ''
+      let filter = filters[name]
       if (typeof filter !== 'function') {
         if (options.strict_filters) {
           throw new TypeError(`undefined filter: ${name}`)
@@ -32,12 +32,12 @@ module.exports = function (options) {
         return this
       }
 
-      var args = []
+      let args = []
       while ((match = valueRE.exec(argList.trim()))) {
-        var v = match[0]
-        var re = new RegExp(`${v}\\s*:`, 'g')
-        var keyMatch = re.exec(match.input)
-        var currentMatchIsKey = keyMatch && keyMatch.index === match.index
+        let v = match[0]
+        let re = new RegExp(`${v}\\s*:`, 'g')
+        let keyMatch = re.exec(match.input)
+        let currentMatchIsKey = keyMatch && keyMatch.index === match.index
         currentMatchIsKey ? args.push(`'${v}'`) : args.push(v)
       }
 
@@ -50,7 +50,7 @@ module.exports = function (options) {
   }
 
   function construct (str) {
-    var instance = Object.create(_filterInstance)
+    let instance = Object.create(_filterInstance)
     return instance.parse(str)
   }
 
diff --git a/src/index.js b/src/index.js
index d3abd948f..a6faa49f0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,23 +1,22 @@
-const Scope = require('./scope')
-const _ = require('./util/underscore.js')
-const assert = require('./util/assert.js')
-const tokenizer = require('./tokenizer.js')
-const statFileAsync = require('./util/fs.js').statFileAsync
-const readFileAsync = require('./util/fs.js').readFileAsync
-const path = require('path')
-const url = require('./util/url.js')
-const Render = require('./render.js')
-const lexical = require('./lexical.js')
-const Tag = require('./tag.js')
-const Filter = require('./filter.js')
-const Parser = require('./parser')
-const Syntax = require('./syntax.js')
-const tags = require('./tags')
-const filters = require('./filters')
-const anySeries = require('./util/promise.js').anySeries
-const Errors = require('./util/error.js')
+import Scope from './scope'
+import _ from './util/underscore.js'
+import assert from './util/assert.js'
+import tokenizer from './tokenizer.js'
+import {statFileAsync, readFileAsync} from './util/fs.js'
+import path from 'path'
+import {valid as isValidUrl, extname, resolve} from './util/url.js'
+import lexical from './lexical.js'
+import Render from './render.js'
+import Tag from './tag.js'
+import Filter from './filter.js'
+import Parser from './parser'
+import {isTruthy, isFalsy, evalExp, evalValue} from './syntax.js'
+import tags from './tags'
+import filters from './filters'
+import {anySeries} from './util/promise.js'
+import Errors from './util/error.js'
 
-var _engine = {
+let _engine = {
   init: function (tag, filter, options) {
     if (options.cache) {
       this.cache = {}
@@ -34,12 +33,12 @@ var _engine = {
     return this
   },
   parse: function (html, filepath) {
-    var tokens = tokenizer.parse(html, filepath, this.options)
+    let tokens = tokenizer.parse(html, filepath, this.options)
     return this.parser.parse(tokens)
   },
   render: function (tpl, ctx, opts) {
     opts = _.assign({}, this.options, opts)
-    var scope = Scope.factory(ctx, opts)
+    let scope = Scope.factory(ctx, opts)
     return this.renderer.renderTemplates(tpl, scope)
   },
   parseAndRender: function (html, ctx, opts) {
@@ -53,7 +52,7 @@ var _engine = {
       .then(templates => this.render(templates, ctx, opts))
   },
   evalValue: function (str, scope) {
-    var tpl = this.parser.parseValue(str.trim())
+    let tpl = this.parser.parseValue(str.trim())
     return this.renderer.evalValue(tpl, scope)
   },
   registerFilter: function (name, filter) {
@@ -65,7 +64,7 @@ var _engine = {
   lookup: function (filepath, root) {
     root = this.options.root.concat(root || [])
     root = _.uniq(root)
-    var paths = root.map(root => path.resolve(root, filepath))
+    let paths = root.map(root => path.resolve(root, filepath))
     return anySeries(paths, path => statFileAsync(path).then(() => path))
       .catch((e) => {
         e.message = `${e.code}: Failed to lookup ${filepath} in: ${root}`
@@ -85,7 +84,7 @@ var _engine = {
       .lookup(filepath, root)
       .then(filepath => {
         if (this.options.cache) {
-          var tpl = this.cache[filepath]
+          let tpl = this.cache[filepath]
           if (tpl) {
             return Promise.resolve(tpl)
           }
@@ -98,26 +97,26 @@ var _engine = {
       })
   },
   getTemplateFromUrl: function (filepath, root) {
-    var fullUrl
-    if (url.valid(filepath)) {
+    let fullUrl
+    if (isValidUrl(filepath)) {
       fullUrl = filepath
     } else {
-      if (!url.extname(filepath)) {
+      if (!extname(filepath)) {
         filepath += this.options.extname
       }
-      fullUrl = url.resolve(root || this.options.root, filepath)
+      fullUrl = resolve(root || this.options.root, filepath)
     }
     if (this.options.cache) {
-      var tpl = this.cache[filepath]
+      let tpl = this.cache[filepath]
       if (tpl) {
         return Promise.resolve(tpl)
       }
     }
     return new Promise((resolve, reject) => {
-      var xhr = new XMLHttpRequest()
+      let xhr = new XMLHttpRequest()
       xhr.onload = () => {
         if (xhr.status >= 200 && xhr.status < 300) {
-          var tpl = this.parse(xhr.responseText)
+          let tpl = this.parse(xhr.responseText)
           if (this.options.cache) {
             this.cache[filepath] = tpl
           }
@@ -135,7 +134,7 @@ var _engine = {
   },
   express: function (opts) {
     opts = opts || {}
-    var self = this
+    let self = this
     return function (filePath, ctx, callback) {
       assert(Array.isArray(this.root) || _.isString(this.root),
         'illegal views root, are you using express.js?')
@@ -163,7 +162,7 @@ function factory (options) {
   }, options)
   options.root = normalizeStringArray(options.root)
 
-  var engine = Object.create(_engine)
+  let engine = Object.create(_engine)
   engine.init(Tag(), Filter(options), options)
   return engine
 }
@@ -174,16 +173,18 @@ function normalizeStringArray (value) {
   return []
 }
 
-factory.lexical = lexical
-factory.isTruthy = Syntax.isTruthy
-factory.isFalsy = Syntax.isFalsy
-factory.evalExp = Syntax.evalExp
-factory.evalValue = Syntax.evalValue
-factory.Types = {
+const Types = {
   ParseError: Errors.ParseError,
   TokenizationEroor: Errors.TokenizationError,
   RenderBreakError: Errors.RenderBreakError,
   AssertionError: Errors.AssertionError
 }
 
+factory.isTruthy = isTruthy
+factory.isFalsy = isFalsy
+factory.evalExp = evalExp
+factory.evalValue = evalValue
+factory.Types = Types
+factory.lexical = lexical
+
 module.exports = factory
diff --git a/src/lexical.js b/src/lexical.js
index a263ad9e4..2a10c1b9e 100644
--- a/src/lexical.js
+++ b/src/lexical.js
@@ -1,49 +1,49 @@
 // quote related
-var singleQuoted = /'[^']*'/
-var doubleQuoted = /"[^"]*"/
-var quoted = new RegExp(`${singleQuoted.source}|${doubleQuoted.source}`)
-var quoteBalanced = new RegExp(`(?:${quoted.source}|[^'"])*`)
+let singleQuoted = /'[^']*'/
+let doubleQuoted = /"[^"]*"/
+let quoted = new RegExp(`${singleQuoted.source}|${doubleQuoted.source}`)
+let quoteBalanced = new RegExp(`(?:${quoted.source}|[^'"])*`)
 
 // basic types
-var integer = /-?\d+/
-var number = /-?\d+\.?\d*|\.?\d+/
-var bool = /true|false/
+let integer = /-?\d+/
+let number = /-?\d+\.?\d*|\.?\d+/
+let bool = /true|false/
 
 // peoperty access
-var identifier = /[\w-]+[?]?/
-var subscript = new RegExp(`\\[(?:${quoted.source}|[\\w-\\.]+)\\]`)
-var literal = new RegExp(`(?:${quoted.source}|${bool.source}|${number.source})`)
-var variable = new RegExp(`${identifier.source}(?:\\.${identifier.source}|${subscript.source})*`)
+let identifier = /[\w-]+[?]?/
+let subscript = new RegExp(`\\[(?:${quoted.source}|[\\w-\\.]+)\\]`)
+let literal = new RegExp(`(?:${quoted.source}|${bool.source}|${number.source})`)
+let variable = new RegExp(`${identifier.source}(?:\\.${identifier.source}|${subscript.source})*`)
 
 // range related
-var rangeLimit = new RegExp(`(?:${variable.source}|${number.source})`)
-var range = new RegExp(`\\(${rangeLimit.source}\\.\\.${rangeLimit.source}\\)`)
-var rangeCapture = new RegExp(`\\((${rangeLimit.source})\\.\\.(${rangeLimit.source})\\)`)
+let rangeLimit = new RegExp(`(?:${variable.source}|${number.source})`)
+let range = new RegExp(`\\(${rangeLimit.source}\\.\\.${rangeLimit.source}\\)`)
+let rangeCapture = new RegExp(`\\((${rangeLimit.source})\\.\\.(${rangeLimit.source})\\)`)
 
-var value = new RegExp(`(?:${variable.source}|${literal.source}|${range.source})`)
+let value = new RegExp(`(?:${variable.source}|${literal.source}|${range.source})`)
 
 // hash related
-var hash = new RegExp(`(?:${identifier.source})\\s*:\\s*(?:${value.source})`)
-var hashCapture = new RegExp(`(${identifier.source})\\s*:\\s*(${value.source})`, 'g')
+let hash = new RegExp(`(?:${identifier.source})\\s*:\\s*(?:${value.source})`)
+let hashCapture = new RegExp(`(${identifier.source})\\s*:\\s*(${value.source})`, 'g')
 
 // full match
-var tagLine = new RegExp(`^\\s*(${identifier.source})\\s*([\\s\\S]*)\\s*$`)
-var literalLine = new RegExp(`^${literal.source}$`, 'i')
-var variableLine = new RegExp(`^${variable.source}$`)
-var numberLine = new RegExp(`^${number.source}$`)
-var boolLine = new RegExp(`^${bool.source}$`, 'i')
-var quotedLine = new RegExp(`^${quoted.source}$`)
-var rangeLine = new RegExp(`^${rangeCapture.source}$`)
-var integerLine = new RegExp(`^${integer.source}$`)
+let tagLine = new RegExp(`^\\s*(${identifier.source})\\s*([\\s\\S]*)\\s*$`)
+let literalLine = new RegExp(`^${literal.source}$`, 'i')
+let variableLine = new RegExp(`^${variable.source}$`)
+let numberLine = new RegExp(`^${number.source}$`)
+let boolLine = new RegExp(`^${bool.source}$`, 'i')
+let quotedLine = new RegExp(`^${quoted.source}$`)
+let rangeLine = new RegExp(`^${rangeCapture.source}$`)
+let integerLine = new RegExp(`^${integer.source}$`)
 
 // filter related
-var valueDeclaration = new RegExp(`(?:${identifier.source}\\s*:\\s*)?${value.source}`)
-var valueList = new RegExp(`${valueDeclaration.source}(\\s*,\\s*${valueDeclaration.source})*`)
-var filter = new RegExp(`${identifier.source}(?:\\s*:\\s*${valueList.source})?`, 'g')
-var filterCapture = new RegExp(`(${identifier.source})(?:\\s*:\\s*(${valueList.source}))?`)
-var filterLine = new RegExp(`^${filterCapture.source}$`)
+let valueDeclaration = new RegExp(`(?:${identifier.source}\\s*:\\s*)?${value.source}`)
+let valueList = new RegExp(`${valueDeclaration.source}(\\s*,\\s*${valueDeclaration.source})*`)
+let filter = new RegExp(`${identifier.source}(?:\\s*:\\s*${valueList.source})?`, 'g')
+let filterCapture = new RegExp(`(${identifier.source})(?:\\s*:\\s*(${valueList.source}))?`)
+let filterLine = new RegExp(`^${filterCapture.source}$`)
 
-var operators = [
+let operators = [
   /\s+or\s+/,
   /\s+and\s+/,
   /==|!=|<=|>=|<|>|\s+contains\s+/
@@ -70,7 +70,7 @@ function matchValue (str) {
 }
 
 function parseLiteral (str) {
-  var res = str.match(numberLine)
+  let res = str.match(numberLine)
   if (res) {
     return Number(str)
   }
diff --git a/src/parser.js b/src/parser.js
index 0bb360cc0..38da3782f 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -3,7 +3,7 @@ const ParseError = require('./util/error.js').ParseError
 const assert = require('./util/assert.js')
 
 module.exports = function (Tag, Filter) {
-  var stream = {
+  let stream = {
     init: function (tokens) {
       this.tokens = tokens
       this.handlers = {}
@@ -14,7 +14,7 @@ module.exports = function (Tag, Filter) {
       return this
     },
     trigger: function (event, arg) {
-      var h = this.handlers[event]
+      let h = this.handlers[event]
       if (typeof h === 'function') {
         h(arg)
         return true
@@ -22,14 +22,14 @@ module.exports = function (Tag, Filter) {
     },
     start: function () {
       this.trigger('start')
-      var token
+      let token
       while (!this.stopRequested && (token = this.tokens.shift())) {
         if (this.trigger('token', token)) continue
         if (token.type === 'tag' &&
             this.trigger(`tag:${token.name}`, token)) {
           continue
         }
-        var template = parseToken(token, this.tokens)
+        let template = parseToken(token, this.tokens)
         this.trigger('template', template)
       }
       if (!this.stopRequested) this.trigger('end')
@@ -42,8 +42,8 @@ module.exports = function (Tag, Filter) {
   }
 
   function parse (tokens) {
-    var token
-    var templates = []
+    let token
+    let templates = []
     while ((token = tokens.shift())) {
       templates.push(parseToken(token, tokens))
     }
@@ -52,7 +52,7 @@ module.exports = function (Tag, Filter) {
 
   function parseToken (token, tokens) {
     try {
-      var tpl = null
+      let tpl = null
       if (token.type === 'tag') {
         tpl = parseTag(token, tokens)
       } else if (token.type === 'value') {
@@ -73,13 +73,13 @@ module.exports = function (Tag, Filter) {
   }
 
   function parseValue (str) {
-    var match = lexical.matchValue(str)
+    let match = lexical.matchValue(str)
     assert(match, `illegal value string: ${str}`)
 
-    var initial = match[0]
+    let initial = match[0]
     str = str.substr(match.index + match[0].length)
 
-    var filters = []
+    let filters = []
     while ((match = lexical.filter.exec(str))) {
       filters.push([match[0].trim()])
     }
@@ -92,7 +92,7 @@ module.exports = function (Tag, Filter) {
   }
 
   function parseStream (tokens) {
-    var s = Object.create(stream)
+    let s = Object.create(stream)
     return s.init(tokens)
   }
 
diff --git a/src/render.js b/src/render.js
index 563cb610f..b7c1e818a 100644
--- a/src/render.js
+++ b/src/render.js
@@ -5,12 +5,12 @@ const _ = require('./util/underscore.js')
 const RenderError = require('./util/error.js').RenderError
 const assert = require('./util/assert.js')
 
-var render = {
+let render = {
 
   renderTemplates: function (templates, scope) {
     assert(scope, 'unable to evalTemplates: scope undefined')
 
-    var html = ''
+    let html = ''
     return mapSeries(templates, (tpl) => {
       return renderTemplate.call(this, tpl)
         .then(partial => (html += partial))
@@ -60,7 +60,7 @@ var render = {
 }
 
 function factory () {
-  var instance = Object.create(render)
+  let instance = Object.create(render)
   return instance
 }
 
diff --git a/src/scope.js b/src/scope.js
index 1634eae26..989dd7aec 100644
--- a/src/scope.js
+++ b/src/scope.js
@@ -3,7 +3,7 @@ const _ = require('./util/underscore.js')
 const lexical = require('./lexical.js')
 const assert = require('./util/assert.js')
 
-var Scope = {
+let Scope = {
   getAll: function () {
     return this.contexts.reduce((ctx, val) => Object.assign(ctx, val), Object.create(null))
   },
@@ -140,8 +140,8 @@ var Scope = {
 }
 
 function matchRightBracket (str, begin) {
-  var stack = 1 // count of '[' - count of ']'
-  for (var i = begin; i < str.length; i++) {
+  let stack = 1 // count of '[' - count of ']'
+  for (let i = begin; i < str.length; i++) {
     if (str[i] === '[') {
       stack++
     }
@@ -156,14 +156,14 @@ function matchRightBracket (str, begin) {
 }
 
 exports.factory = function (ctx, opts) {
-  var defaultOptions = {
+  let defaultOptions = {
     dynamicPartials: true,
     strict_variables: false,
     strict_filters: false,
     blocks: {},
     root: []
   }
-  var scope = Object.create(Scope)
+  let scope = Object.create(Scope)
   scope.opts = _.assign(defaultOptions, opts)
   scope.contexts = [ctx || {}]
   return scope
diff --git a/src/syntax.js b/src/syntax.js
index 9d6e98fac..dd8326929 100644
--- a/src/syntax.js
+++ b/src/syntax.js
@@ -1,27 +1,27 @@
 const operators = require('./operators.js')(isTruthy)
 const lexical = require('./lexical.js')
-const assert = require('../src/util/assert.js')
+const assert = require('./util/assert.js')
 
 function evalExp (exp, scope) {
   assert(scope, 'unable to evalExp: scope undefined')
-  var operatorREs = lexical.operators
-  var match
-  for (var i = 0; i < operatorREs.length; i++) {
-    var operatorRE = operatorREs[i]
-    var expRE = new RegExp(`^(${lexical.quoteBalanced.source})(${operatorRE.source})(${lexical.quoteBalanced.source})$`)
+  let operatorREs = lexical.operators
+  let match
+  for (let i = 0; i < operatorREs.length; i++) {
+    let operatorRE = operatorREs[i]
+    let expRE = new RegExp(`^(${lexical.quoteBalanced.source})(${operatorRE.source})(${lexical.quoteBalanced.source})$`)
     if ((match = exp.match(expRE))) {
-      var l = evalExp(match[1], scope)
-      var op = operators[match[2].trim()]
-      var r = evalExp(match[3], scope)
+      let l = evalExp(match[1], scope)
+      let op = operators[match[2].trim()]
+      let r = evalExp(match[3], scope)
       return op(l, r)
     }
   }
 
   if ((match = exp.match(lexical.rangeLine))) {
-    var low = evalValue(match[1], scope)
-    var high = evalValue(match[2], scope)
-    var range = []
-    for (var j = low; j <= high; j++) {
+    let low = evalValue(match[1], scope)
+    let high = evalValue(match[2], scope)
+    let range = []
+    for (let j = low; j <= high; j++) {
       range.push(j)
     }
     return range
diff --git a/src/tags/assign.js b/src/tags/assign.js
index 9f67d39e6..1911aec17 100644
--- a/src/tags/assign.js
+++ b/src/tags/assign.js
@@ -1,9 +1,8 @@
-'use strict'
-const Liquid = require('..')
-const lexical = Liquid.lexical
+import {lexical} from '../index'
+import assert from '../util/assert.js'
+import {types} from '../scope'
+
 const re = new RegExp(`(${lexical.identifier.source})\\s*=(.*)`)
-const assert = require('../util/assert.js')
-const types = require('../scope').types
 
 module.exports = function (liquid) {
   liquid.registerTag('assign', {
diff --git a/src/tags/capture.js b/src/tags/capture.js
index 089a745e7..c20aaa81a 100644
--- a/src/tags/capture.js
+++ b/src/tags/capture.js
@@ -8,13 +8,13 @@ const types = require('../scope.js').types
 module.exports = function (liquid) {
   liquid.registerTag('capture', {
     parse: function (tagToken, remainTokens) {
-      var match = tagToken.args.match(re)
+      let match = tagToken.args.match(re)
       assert(match, `${tagToken.args} not valid identifier`)
 
       this.variable = match[1]
       this.templates = []
 
-      var stream = liquid.parser.parseStream(remainTokens)
+      let stream = liquid.parser.parseStream(remainTokens)
       stream.on('tag:endcapture', token => stream.stop())
         .on('template', tpl => this.templates.push(tpl))
         .on('end', x => {
diff --git a/src/tags/case.js b/src/tags/case.js
index ec74407cd..1799d1a19 100644
--- a/src/tags/case.js
+++ b/src/tags/case.js
@@ -1,4 +1,4 @@
-const Liquid = require('..')
+import Liquid from '..'
 
 module.exports = function (liquid) {
   liquid.registerTag('case', {
@@ -8,8 +8,8 @@ module.exports = function (liquid) {
       this.cases = []
       this.elseTemplates = []
 
-      var p = []
-      var stream = liquid.parser.parseStream(remainTokens)
+      let p = []
+      let stream = liquid.parser.parseStream(remainTokens)
         .on('tag:when', token => {
           this.cases.push({
             val: token.args,
@@ -27,10 +27,10 @@ module.exports = function (liquid) {
     },
 
     render: function (scope, hash) {
-      for (var i = 0; i < this.cases.length; i++) {
-        var branch = this.cases[i]
-        var val = Liquid.evalExp(branch.val, scope)
-        var cond = Liquid.evalExp(this.cond, scope)
+      for (let i = 0; i < this.cases.length; i++) {
+        let branch = this.cases[i]
+        let val = Liquid.evalExp(branch.val, scope)
+        let cond = Liquid.evalExp(this.cond, scope)
         if (val === cond) {
           return liquid.renderer.renderTemplates(branch.templates, scope)
         }
diff --git a/src/tags/comment.js b/src/tags/comment.js
index dc915f2dc..713ab12b2 100644
--- a/src/tags/comment.js
+++ b/src/tags/comment.js
@@ -1,7 +1,7 @@
 module.exports = function (liquid) {
   liquid.registerTag('comment', {
     parse: function (tagToken, remainTokens) {
-      var stream = liquid.parser.parseStream(remainTokens)
+      let stream = liquid.parser.parseStream(remainTokens)
       stream
         .on('token', token => {
           if (token.name === 'endcomment') stream.stop()
diff --git a/src/tags/cycle.js b/src/tags/cycle.js
index aeb711230..a8b6e80e6 100644
--- a/src/tags/cycle.js
+++ b/src/tags/cycle.js
@@ -8,11 +8,11 @@ module.exports = function (liquid) {
   liquid.registerTag('cycle', {
 
     parse: function (tagToken, remainTokens) {
-      var match = groupRE.exec(tagToken.args)
+      let match = groupRE.exec(tagToken.args)
       assert(match, `illegal tag: ${tagToken.raw}`)
 
       this.group = match[1] || ''
-      var candidates = match[2]
+      let candidates = match[2]
 
       this.candidates = []
 
@@ -23,17 +23,17 @@ module.exports = function (liquid) {
     },
 
     render: function (scope, hash) {
-      var group = Liquid.evalValue(this.group, scope)
-      var fingerprint = `cycle:${group}:` + this.candidates.join(',')
+      let group = Liquid.evalValue(this.group, scope)
+      let fingerprint = `cycle:${group}:` + this.candidates.join(',')
 
-      var groups = scope.opts.groups = scope.opts.groups || {}
-      var idx = groups[fingerprint]
+      let groups = scope.opts.groups = scope.opts.groups || {}
+      let idx = groups[fingerprint]
 
       if (idx === undefined) {
         idx = groups[fingerprint] = 0
       }
 
-      var candidate = this.candidates[idx]
+      let candidate = this.candidates[idx]
       idx = (idx + 1) % this.candidates.length
       groups[fingerprint] = idx
 
diff --git a/src/tags/decrement.js b/src/tags/decrement.js
index 7aa1df0d8..679844e3a 100644
--- a/src/tags/decrement.js
+++ b/src/tags/decrement.js
@@ -7,7 +7,7 @@ const types = require('../scope').types
 module.exports = function (liquid) {
   liquid.registerTag('decrement', {
     parse: function (token) {
-      var match = token.args.match(lexical.identifier)
+      let match = token.args.match(lexical.identifier)
       assert(match, `illegal identifier ${token.args}`)
       this.variable = match[0]
     },
diff --git a/src/tags/for.js b/src/tags/for.js
index 775318ba7..acadf3ec6 100644
--- a/src/tags/for.js
+++ b/src/tags/for.js
@@ -1,9 +1,9 @@
-const Liquid = require('..')
-const lexical = Liquid.lexical
-const mapSeries = require('../util/promise.js').mapSeries
-const _ = require('../util/underscore.js')
+import {default as Liquid, lexical} from '../index'
+import {mapSeries} from '../util/promise.js'
+import _ from '../util/underscore.js'
+import assert from '../util/assert.js'
+
 const RenderBreakError = Liquid.Types.RenderBreakError
-const assert = require('../util/assert.js')
 const re = new RegExp(`^(${lexical.identifier.source})\\s+in\\s+` +
     `(${lexical.value.source})` +
     `(?:\\s+${lexical.hash.source})*` +
@@ -14,7 +14,7 @@ module.exports = function (liquid) {
   liquid.registerTag('for', {
 
     parse: function (tagToken, remainTokens) {
-      var match = re.exec(tagToken.args)
+      let match = re.exec(tagToken.args)
       assert(match, `illegal tag: ${tagToken.raw}`)
       this.variable = match[1]
       this.collection = match[2]
@@ -23,8 +23,8 @@ module.exports = function (liquid) {
       this.templates = []
       this.elseTemplates = []
 
-      var p
-      var stream = liquid.parser.parseStream(remainTokens)
+      let p
+      let stream = liquid.parser.parseStream(remainTokens)
         .on('start', () => (p = this.templates))
         .on('tag:else', () => (p = this.elseTemplates))
         .on('tag:endfor', () => stream.stop())
@@ -37,7 +37,7 @@ module.exports = function (liquid) {
     },
 
     render: function (scope, hash) {
-      var collection = Liquid.evalExp(this.collection, scope)
+      let collection = Liquid.evalExp(this.collection, scope)
 
       if (!Array.isArray(collection)) {
         if (_.isString(collection) && collection.length > 0) {
@@ -50,14 +50,14 @@ module.exports = function (liquid) {
         return liquid.renderer.renderTemplates(this.elseTemplates, scope)
       }
 
-      var offset = hash.offset || 0
-      var limit = (hash.limit === undefined) ? collection.length : hash.limit
+      let offset = hash.offset || 0
+      let limit = (hash.limit === undefined) ? collection.length : hash.limit
 
       collection = collection.slice(offset, offset + limit)
       if (this.reversed) collection.reverse()
 
-      var contexts = collection.map((item, i) => {
-        var ctx = {}
+      let contexts = collection.map((item, i) => {
+        let ctx = {}
         ctx[this.variable] = item
         ctx.forloop = {
           first: i === 0,
@@ -71,7 +71,7 @@ module.exports = function (liquid) {
         return ctx
       })
 
-      var html = ''
+      let html = ''
       return mapSeries(contexts, (context) => {
         return Promise.resolve()
           .then(() => scope.push(context))
diff --git a/src/tags/if.js b/src/tags/if.js
index 486238e56..20b96faa4 100644
--- a/src/tags/if.js
+++ b/src/tags/if.js
@@ -1,4 +1,4 @@
-const Liquid = require('..')
+import Liquid from '..'
 
 module.exports = function (liquid) {
   liquid.registerTag('if', {
@@ -7,8 +7,8 @@ module.exports = function (liquid) {
       this.branches = []
       this.elseTemplates = []
 
-      var p
-      var stream = liquid.parser.parseStream(remainTokens)
+      let p
+      let stream = liquid.parser.parseStream(remainTokens)
         .on('start', () => this.branches.push({
           cond: tagToken.args,
           templates: (p = [])
@@ -30,9 +30,9 @@ module.exports = function (liquid) {
     },
 
     render: function (scope, hash) {
-      for (var i = 0; i < this.branches.length; i++) {
-        var branch = this.branches[i]
-        var cond = Liquid.evalExp(branch.cond, scope)
+      for (let i = 0; i < this.branches.length; i++) {
+        let branch = this.branches[i]
+        let cond = Liquid.evalExp(branch.cond, scope)
         if (Liquid.isTruthy(cond)) {
           return liquid.renderer.renderTemplates(branch.templates, scope)
         }
diff --git a/src/tags/layout.js b/src/tags/layout.js
index 100b11906..5850b6831 100644
--- a/src/tags/layout.js
+++ b/src/tags/layout.js
@@ -12,7 +12,7 @@ const staticFileRE = /\S+/
 module.exports = function (liquid) {
   liquid.registerTag('layout', {
     parse: function (token, remainTokens) {
-      var match = staticFileRE.exec(token.args)
+      let match = staticFileRE.exec(token.args)
       if (match) {
         this.staticLayout = match[0]
       }
@@ -25,7 +25,7 @@ module.exports = function (liquid) {
       this.tpls = liquid.parser.parse(remainTokens)
     },
     render: function (scope, hash) {
-      var layout = scope.opts.dynamicPartials ? Liquid.evalValue(this.layout, scope) : this.staticLayout
+      let layout = scope.opts.dynamicPartials ? Liquid.evalValue(this.layout, scope) : this.staticLayout
       assert(layout, `cannot apply layout with empty filename`)
 
       // render the remaining tokens immediately
@@ -51,11 +51,11 @@ module.exports = function (liquid) {
 
   liquid.registerTag('block', {
     parse: function (token, remainTokens) {
-      var match = /\w+/.exec(token.args)
+      let match = /\w+/.exec(token.args)
       this.block = match ? match[0] : ''
 
       this.tpls = []
-      var stream = liquid.parser.parseStream(remainTokens)
+      let stream = liquid.parser.parseStream(remainTokens)
         .on('tag:endblock', () => stream.stop())
         .on('template', tpl => this.tpls.push(tpl))
         .on('end', () => {
diff --git a/src/tags/raw.js b/src/tags/raw.js
index 9f11d4881..898d9edb4 100644
--- a/src/tags/raw.js
+++ b/src/tags/raw.js
@@ -3,7 +3,7 @@ module.exports = function (liquid) {
     parse: function (tagToken, remainTokens) {
       this.tokens = []
 
-      var stream = liquid.parser.parseStream(remainTokens)
+      let stream = liquid.parser.parseStream(remainTokens)
       stream
         .on('token', token => {
           if (token.name === 'endraw') stream.stop()
diff --git a/src/tags/tablerow.js b/src/tags/tablerow.js
index afab57009..9f3a1ef05 100644
--- a/src/tags/tablerow.js
+++ b/src/tags/tablerow.js
@@ -1,7 +1,8 @@
-const Liquid = require('..')
-const mapSeries = require('../util/promise.js').mapSeries
+import Liquid from '..'
+import {mapSeries} from '../util/promise.js'
+import assert from '../util/assert.js'
+
 const lexical = Liquid.lexical
-const assert = require('../util/assert.js')
 const re = new RegExp(`^(${lexical.identifier.source})\\s+in\\s+` +
   `(${lexical.value.source})` +
   `(?:\\s+${lexical.hash.source})*$`)
@@ -10,15 +11,15 @@ module.exports = function (liquid) {
   liquid.registerTag('tablerow', {
 
     parse: function (tagToken, remainTokens) {
-      var match = re.exec(tagToken.args)
+      let match = re.exec(tagToken.args)
       assert(match, `illegal tag: ${tagToken.raw}`)
 
       this.variable = match[1]
       this.collection = match[2]
       this.templates = []
 
-      var p
-      var stream = liquid.parser.parseStream(remainTokens)
+      let p
+      let stream = liquid.parser.parseStream(remainTokens)
         .on('start', () => (p = this.templates))
         .on('tag:endtablerow', token => stream.stop())
         .on('template', tpl => p.push(tpl))
@@ -30,21 +31,21 @@ module.exports = function (liquid) {
     },
 
     render: function (scope, hash) {
-      var collection = Liquid.evalExp(this.collection, scope) || []
+      let collection = Liquid.evalExp(this.collection, scope) || []
 
-      var html = ''
-      var offset = hash.offset || 0
-      var limit = (hash.limit === undefined) ? collection.length : hash.limit
+      let html = ''
+      let offset = hash.offset || 0
+      let limit = (hash.limit === undefined) ? collection.length : hash.limit
 
-      var cols = hash.cols
-      var row
-      var col
+      let cols = hash.cols
+      let row
+      let col
 
       // build array of arguments to pass to sequential promises...
       collection = collection.slice(offset, offset + limit)
       if (!cols) cols = collection.length
-      var contexts = collection.map((item, i) => {
-        var ctx = {}
+      let contexts = collection.map((item, i) => {
+        let ctx = {}
         ctx[this.variable] = item
         return ctx
       })
diff --git a/src/tags/unless.js b/src/tags/unless.js
index eb49bd504..77a1a3de8 100644
--- a/src/tags/unless.js
+++ b/src/tags/unless.js
@@ -1,12 +1,12 @@
-const Liquid = require('..')
+import Liquid from '../index'
 
 module.exports = function (liquid) {
   liquid.registerTag('unless', {
     parse: function (tagToken, remainTokens) {
       this.templates = []
       this.elseTemplates = []
-      var p
-      var stream = liquid.parser.parseStream(remainTokens)
+      let p
+      let stream = liquid.parser.parseStream(remainTokens)
         .on('start', x => {
           p = this.templates
           this.cond = tagToken.args
@@ -22,7 +22,7 @@ module.exports = function (liquid) {
     },
 
     render: function (scope, hash) {
-      var cond = Liquid.evalExp(this.cond, scope)
+      let cond = Liquid.evalExp(this.cond, scope)
       return Liquid.isFalsy(cond)
         ? liquid.renderer.renderTemplates(this.templates, scope)
         : liquid.renderer.renderTemplates(this.elseTemplates, scope)
diff --git a/src/tokenizer.js b/src/tokenizer.js
index 38a3d65c2..1f9adc41e 100644
--- a/src/tokenizer.js
+++ b/src/tokenizer.js
@@ -7,13 +7,13 @@ const assert = require('./util/assert.js')
 function parse (input, file, options) {
   assert(_.isString(input), 'illegal input')
 
-  var rLiquid = /({%-?([\s\S]*?)-?%})|({{-?([\s\S]*?)-?}})/g
-  var currIndent = 0
-  var lineNumber = LineNumber(input)
-  var lastMatchEnd = 0
-  var tokens = []
+  let rLiquid = /({%-?([\s\S]*?)-?%})|({{-?([\s\S]*?)-?}})/g
+  let currIndent = 0
+  let lineNumber = LineNumber(input)
+  let lastMatchEnd = 0
+  let tokens = []
 
-  for (var match; (match = rLiquid.exec(input)); lastMatchEnd = rLiquid.lastIndex) {
+  for (let match; (match = rLiquid.exec(input)); lastMatchEnd = rLiquid.lastIndex) {
     if (match.index > lastMatchEnd) {
       tokens.push(parseHTMLToken(lastMatchEnd, match.index))
     }
@@ -28,8 +28,8 @@ function parse (input, file, options) {
   return tokens
 
   function parseTagToken (raw, value, pos) {
-    var match = value.match(lexical.tagLine)
-    var token = {
+    let match = value.match(lexical.tagLine)
+    let token = {
       type: 'tag',
       indent: currIndent,
       line: lineNumber.get(pos),
@@ -62,7 +62,7 @@ function parse (input, file, options) {
   }
 
   function parseHTMLToken (begin, end) {
-    var htmlFragment = input.slice(begin, end)
+    let htmlFragment = input.slice(begin, end)
     currIndent = _.last((htmlFragment).split('\n')).length
 
     return {
@@ -74,12 +74,12 @@ function parse (input, file, options) {
 }
 
 function LineNumber (html) {
-  var parsedLinesCount = 0
-  var lastMatchBegin = -1
+  let parsedLinesCount = 0
+  let lastMatchBegin = -1
 
   return {
     get: function (pos) {
-      var lines = html.slice(lastMatchBegin + 1, pos).split('\n')
+      let lines = html.slice(lastMatchBegin + 1, pos).split('\n')
       parsedLinesCount += lines.length - 1
       lastMatchBegin = pos
       return parsedLinesCount + 1
diff --git a/src/util/error.js b/src/util/error.js
index f919bcb08..f444b0b98 100644
--- a/src/util/error.js
+++ b/src/util/error.js
@@ -1,4 +1,4 @@
-const _ = require('./underscore.js')
+import _ from './underscore.js'
 
 function initError () {
   this.name = this.constructor.name
@@ -14,7 +14,7 @@ function initLiquidError (err, token) {
   this.line = token.line
   this.file = token.file
 
-  var context = mkContext(token.input, token.line)
+  let context = mkContext(token.input, token.line)
   this.message = mkMessage(err.message, token)
   this.stack = context +
     '\n' + (this.stack || this.message) +
@@ -64,11 +64,11 @@ AssertionError.prototype = Object.create(Error.prototype)
 AssertionError.prototype.constructor = AssertionError
 
 function mkContext (input, line) {
-  var lines = input.split('\n')
-  var begin = Math.max(line - 2, 1)
-  var end = Math.min(line + 3, lines.length)
+  let lines = input.split('\n')
+  let begin = Math.max(line - 2, 1)
+  let end = Math.min(line + 3, lines.length)
 
-  var context = _
+  let context = _
     .range(begin, end + 1)
     .map(l => [
       (l === line) ? '>> ' : '   ',
@@ -82,9 +82,9 @@ function mkContext (input, line) {
 }
 
 function align (n, max) {
-  var length = (max + '').length
-  var str = n + ''
-  var blank = Array(length - str.length).join(' ')
+  let length = (max + '').length
+  let str = n + ''
+  let blank = Array(length - str.length).join(' ')
   return blank + str
 }
 
diff --git a/src/util/promise.js b/src/util/promise.js
index 14011c19c..b92ac5365 100644
--- a/src/util/promise.js
+++ b/src/util/promise.js
@@ -5,7 +5,7 @@
  * The iteratee is invoked with three arguments: (value, index, iterable).
  */
 function anySeries (iterable, iteratee) {
-  var ret = Promise.reject(new Error('init'))
+  let ret = Promise.reject(new Error('init'))
   iterable.forEach(function (item, idx) {
     ret = ret.catch(e => iteratee(item, idx, iterable))
   })
@@ -19,8 +19,8 @@ function anySeries (iterable, iteratee) {
  * The iteratee is invoked with three arguments: (value, index, iterable).
  */
 function mapSeries (iterable, iteratee) {
-  var ret = Promise.resolve('init')
-  var result = []
+  let ret = Promise.resolve('init')
+  let result = []
   iterable.forEach(function (item, idx) {
     ret = ret
       .then(() => iteratee(item, idx, iterable))
diff --git a/src/util/strftime.js b/src/util/strftime.js
index 8afd3797b..51fc8975f 100644
--- a/src/util/strftime.js
+++ b/src/util/strftime.js
@@ -1,16 +1,16 @@
-var monthNames = [
+let monthNames = [
   'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August',
   'September', 'October', 'November', 'December'
 ]
-var monthNamesShort = [
+let monthNamesShort = [
   'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct',
   'Nov', 'Dec'
 ]
-var dayNames = [
+let dayNames = [
   'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'
 ]
-var dayNamesShort = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
-var suffixes = {
+let dayNamesShort = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
+let suffixes = {
   1: 'st',
   2: 'nd',
   3: 'rd',
@@ -18,15 +18,15 @@ var suffixes = {
 }
 
 // prototype extensions
-var _date = {
+let _date = {
   daysInMonth: function (d) {
-    var feb = _date.isLeapYear(d) ? 29 : 28
+    let feb = _date.isLeapYear(d) ? 29 : 28
     return [31, feb, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
   },
 
   getDayOfYear: function (d) {
-    var num = 0
-    for (var i = 0; i < d.getMonth(); ++i) {
+    let num = 0
+    for (let i = 0; i < d.getMonth(); ++i) {
       num += _date.daysInMonth(d)[i]
     }
     return num + d.getDate()
@@ -36,21 +36,21 @@ var _date = {
   // TODO: that comment was retarted. fix it.
   getWeekOfYear: function (d, startDay) {
     // Skip to startDay of this week
-    var now = this.getDayOfYear(d) + (startDay - d.getDay())
+    let now = this.getDayOfYear(d) + (startDay - d.getDay())
     // Find the first startDay of the year
-    var jan1 = new Date(d.getFullYear(), 0, 1)
-    var then = (7 - jan1.getDay() + startDay)
+    let jan1 = new Date(d.getFullYear(), 0, 1)
+    let then = (7 - jan1.getDay() + startDay)
     return _number.pad(Math.floor((now - then) / 7) + 1, 2)
   },
 
   isLeapYear: function (d) {
-    var year = d.getFullYear()
+    let year = d.getFullYear()
     return !!((year & 3) === 0 && (year % 100 || (year % 400 === 0 && year)))
   },
 
   getSuffix: function (d) {
-    var str = d.getDate().toString()
-    var index = parseInt(str.slice(-1))
+    let str = d.getDate().toString()
+    let index = parseInt(str.slice(-1))
     return suffixes[index] || suffixes['default']
   },
 
@@ -59,11 +59,11 @@ var _date = {
   }
 }
 
-var _number = {
+let _number = {
   pad: function (value, size, ch) {
     if (!ch) ch = '0'
-    var result = value.toString()
-    var pad = size - result.length
+    let result = value.toString()
+    let pad = size - result.length
 
     while (pad-- > 0) {
       result = ch + result
@@ -73,7 +73,7 @@ var _number = {
   }
 }
 
-var formatCodes = {
+let formatCodes = {
   a: function (d) {
     return dayNamesShort[d.getDay()]
   },
@@ -162,7 +162,7 @@ var formatCodes = {
     return d.getFullYear()
   },
   z: function (d) {
-    var tz = d.getTimezoneOffset() / 60 * 100
+    let tz = d.getTimezoneOffset() / 60 * 100
     return (tz > 0 ? '-' : '+') + _number.pad(Math.abs(tz), 4)
   },
   '%': function () {
@@ -172,13 +172,13 @@ var formatCodes = {
 formatCodes.h = formatCodes.b
 formatCodes.N = formatCodes.L
 
-var strftime = function (d, format) {
-  var output = ''
-  var remaining = format
+let strftime = function (d, format) {
+  let output = ''
+  let remaining = format
 
   while (true) {
-    var r = /%./g
-    var results = r.exec(remaining)
+    let r = /%./g
+    let results = r.exec(remaining)
 
     // No more format codes. Add the remaining text and return
     if (!results) {
@@ -190,8 +190,8 @@ var strftime = function (d, format) {
     remaining = remaining.slice(r.lastIndex)
 
     // Add the format code
-    var ch = results[0].charAt(1)
-    var func = formatCodes[ch]
+    let ch = results[0].charAt(1)
+    let func = formatCodes[ch]
     output += func ? func.call(this, d) : '%' + ch
   }
 }
diff --git a/src/util/underscore.js b/src/util/underscore.js
index 37f233ef0..cd7a5f442 100644
--- a/src/util/underscore.js
+++ b/src/util/underscore.js
@@ -1,4 +1,3 @@
-'use strict'
 const toStr = Object.prototype.toString
 
 /*
@@ -46,7 +45,7 @@ function isArray (value) {
 }
 
 function isError (value) {
-  var signature = Object.prototype.toString.call(value)
+  let signature = Object.prototype.toString.call(value)
   // [object XXXError]
   return signature.substr(-6, 5) === 'Error' ||
         (typeof value.message === 'string' && typeof value.name === 'string')
@@ -62,7 +61,7 @@ function isError (value) {
  */
 function forOwn (object, iteratee) {
   object = object || {}
-  for (var k in object) {
+  for (let k in object) {
     if (object.hasOwnProperty(k)) {
       if (iteratee(object[k], k, object) === false) break
     }
@@ -83,7 +82,7 @@ function forOwn (object, iteratee) {
  */
 function assign (object) {
   object = isObject(object) ? object : {}
-  var srcs = Array.prototype.slice.call(arguments, 1)
+  let srcs = Array.prototype.slice.call(arguments, 1)
   srcs.forEach((src) => Object.assign(object, src))
   return object
 }
@@ -93,9 +92,9 @@ function last (arr) {
 }
 
 function uniq (arr) {
-  var u = {}
-  var a = []
-  for (var i = 0, l = arr.length; i < l; ++i) {
+  let u = {}
+  let a = []
+  for (let i = 0, l = arr.length; i < l; ++i) {
     if (u.hasOwnProperty(arr[i])) {
       continue
     }
@@ -112,7 +111,7 @@ function uniq (arr) {
  * @return {Boolean} Returns true if value is an object, else false.
  */
 function isObject (value) {
-  var type = typeof value
+  let type = typeof value
   return value != null && (type === 'object' || type === 'function')
 }
 
@@ -131,8 +130,8 @@ function range (start, stop, step) {
   }
   step = step || 1
 
-  var arr = []
-  for (var i = start; i < stop; i += step) {
+  let arr = []
+  for (let i = start; i < stop; i += step) {
     arr.push(i)
   }
   return arr
diff --git a/src/util/url.js b/src/util/url.js
index e1068adbc..e38240271 100644
--- a/src/util/url.js
+++ b/src/util/url.js
@@ -1,24 +1,25 @@
-const resolve = require('resolve-url')
+import resolveUrl from 'resolve-url'
+import _ from './underscore'
+
 const splitPathRe = /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^/]+?|)(\.[^./]*|))(?:[/]*)$/
 const urlRe = /^(?:\w+:)?\/\/([^\s.]+\.\S{2}|localhost[:?\d]*)\S*$/
-const _ = require('./underscore')
 
 // https://github.com/jinder/path/blob/master/path.js#L567
-exports.extname = function (path) {
+export function extname (path) {
   return splitPathRe.exec(path).slice(1)[3]
 }
 
 // https://www.npmjs.com/package/is-url
-exports.valid = function (path) {
+export function valid (path) {
   return urlRe.test(path)
 }
 
-exports.resolve = function (root, path) {
+export function resolve (root, path) {
   if (Object.prototype.toString.call(root) === '[object Array]') {
     root = root[0]
   }
   if (root && _.last(root) !== '/') {
     root += '/'
   }
-  return resolve(root, path)
+  return resolveUrl(root, path)
 }
diff --git a/src/whitespace-ctrl.js b/src/whitespace-ctrl.js
index b1584443e..136f8ce5a 100644
--- a/src/whitespace-ctrl.js
+++ b/src/whitespace-ctrl.js
@@ -2,7 +2,7 @@ const _ = require('./util/underscore.js')
 
 function whiteSpaceCtrl (tokens, options) {
   options = _.assign({ greedy: true }, options)
-  var inRaw = false
+  let inRaw = false
 
   tokens.forEach((token, i) => {
     if (shouldTrimLeft(token, inRaw, options)) {
@@ -33,14 +33,14 @@ function shouldTrimRight (token, inRaw, options) {
 function trimLeft (token, greedy) {
   if (!token || token.type !== 'html') return
 
-  var rLeft = greedy ? /\s+$/g : /[\t\r ]*$/g
+  let rLeft = greedy ? /\s+$/g : /[\t\r ]*$/g
   token.value = token.value.replace(rLeft, '')
 }
 
 function trimRight (token, greedy) {
   if (!token || token.type !== 'html') return
 
-  var rRight = greedy ? /^\s+/g : /^[\t\r ]*\n?/g
+  let rRight = greedy ? /^\s+/g : /^[\t\r ]*\n?/g
   token.value = token.value.replace(rRight, '')
 }
 
diff --git a/test/express.js b/test/express.js
index a176a35e9..98d814fd8 100644
--- a/test/express.js
+++ b/test/express.js
@@ -6,7 +6,7 @@ const express = require('express')
 const Liquid = require('../src')
 
 describe('engine#express()', function () {
-  var app, engine
+  let app, engine
 
   beforeEach(function () {
     app = express()
@@ -36,11 +36,11 @@ describe('engine#express()', function () {
       .expect(200, done)
   })
   it('should pass error when file not found', function (done) {
-    var view = {
+    let view = {
       root: []
     }
-    var file = '/not-exist.html'
-    var ctx = {}
+    let file = '/not-exist.html'
+    let ctx = {}
     engine.express().call(view, file, ctx, function (err) {
       try {
         expect(err.code).to.equal('ENOENT')
@@ -82,7 +82,7 @@ describe('engine#express()', function () {
       .expect(200, done)
   })
   it('should respect express views (Undefined) when lookup', function (done) {
-    var files = {}
+    let files = {}
     files[process.cwd() + '/views/include.html'] = '{% include file %}'
     files[process.cwd() + '/views/bar.html'] = 'bar'
     mock(files)
diff --git a/test/filter.js b/test/filter.js
index 5984f83e8..493300f35 100644
--- a/test/filter.js
+++ b/test/filter.js
@@ -5,17 +5,17 @@ const expect = chai.expect
 
 chai.use(sinonChai)
 
-var filter = require('../src/filter.js')()
-var Scope = require('../src/scope.js')
+let filter = require('../src/filter.js')()
+let Scope = require('../src/scope.js')
 
 describe('filter', function () {
-  var scope
+  let scope
   beforeEach(function () {
     filter.clear()
     scope = Scope.factory()
   })
   it('should return default filter when not registered', function () {
-    var result = filter.construct('foo')
+    let result = filter.construct('foo')
     expect(result.name).to.equal('foo')
   })
 
@@ -27,7 +27,7 @@ describe('filter', function () {
 
   it('should parse argument syntax', function () {
     filter.register('foo', x => x)
-    var f = filter.construct('foo: a, "b"')
+    let f = filter.construct('foo: a, "b"')
 
     expect(f.name).to.equal('foo')
     expect(f.args).to.deep.equal(['a', '"b"'])
@@ -49,7 +49,7 @@ describe('filter', function () {
   })
 
   it('should call filter with corrct arguments', function () {
-    var spy = sinon.spy()
+    let spy = sinon.spy()
     filter.register('foo', spy)
     filter.construct('foo: 33').render('foo', scope)
     expect(spy).to.have.been.calledWith('foo', 33)
@@ -57,35 +57,35 @@ describe('filter', function () {
 
   it('should support arguments as named key/values', function () {
     filter.register('foo', x => x)
-    var f = filter.construct('foo: key1: "literal1", key2: value2')
+    let f = filter.construct('foo: key1: "literal1", key2: value2')
     expect(f.name).to.equal('foo')
     expect(f.args).to.deep.equal([ '\'key1\'', '"literal1"', '\'key2\'', 'value2' ])
   })
 
   it('should support arguments as named key/values with inline literals', function () {
     filter.register('foo', x => x)
-    var f = filter.construct('foo: "test0", key1: "literal1", key2: value2')
+    let f = filter.construct('foo: "test0", key1: "literal1", key2: value2')
     expect(f.name).to.equal('foo')
     expect(f.args).to.deep.equal([ '"test0"', '\'key1\'', '"literal1"', '\'key2\'', 'value2' ])
   })
 
   it('should support arguments as named key/values with inline values', function () {
     filter.register('foo', x => x)
-    var f = filter.construct('foo: test0, key1: "literal1", key2: value2')
+    let f = filter.construct('foo: test0, key1: "literal1", key2: value2')
     expect(f.name).to.equal('foo')
     expect(f.args).to.deep.equal([ 'test0', '\'key1\'', '"literal1"', '\'key2\'', 'value2' ])
   })
 
   it('should support argument values named same as keys', function () {
     filter.register('foo', x => x)
-    var f = filter.construct('foo: a: a')
+    let f = filter.construct('foo: a: a')
     expect(f.name).to.equal('foo')
     expect(f.args).to.deep.equal(['\'a\'', 'a'])
   })
 
   it('should support argument literals named same as keys', function () {
     filter.register('foo', x => x)
-    var f = filter.construct('foo: a: "a"')
+    let f = filter.construct('foo: a: "a"')
     expect(f.name).to.equal('foo')
     expect(f.args).to.deep.equal(['\'a\'', '"a"'])
   })
diff --git a/test/filters.js b/test/filters.js
index e88969011..0bfa4177b 100644
--- a/test/filters.js
+++ b/test/filters.js
@@ -1,10 +1,12 @@
-const chai = require('chai')
-const chaiAsPromised = require('chai-as-promised')
-const expect = chai.expect
-var liquid = require('../src')()
-chai.use(chaiAsPromised)
+import chai from 'chai'
+import chaiAsPromised from 'chai-as-promised'
+import Liquid from '../src/index'
 
-var ctx = {
+chai.use(chaiAsPromised)
+const liquid = new Liquid()
+const expect = chai.expect
+
+let ctx = {
   date: new Date(),
   foo: 'bar',
   arr: [-2, 'a'],
@@ -83,7 +85,7 @@ describe('filters', function () {
 
   describe('date', function () {
     it('should support date: %a %b %d %Y', function () {
-      var str = ctx.date.toDateString()
+      let str = ctx.date.toDateString()
       return test('{{ date | date:"%a %b %d %Y"}}', str)
     })
     it('should create a new Date when given "now"', function () {
@@ -128,7 +130,7 @@ describe('filters', function () {
       return test('{{ "Tetsuro Takara" | escape }}', 'Tetsuro Takara')
     })
     it('should escape function', function () {
-      return test('{{ func | escape }}', 'function () {}')
+      return test('{{ func | escape }}', 'function func() {}')
     })
   })
 
@@ -140,7 +142,7 @@ describe('filters', function () {
   })
 
   it('should support split/first', function () {
-    var src = '{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}' +
+    let src = '{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}' +
       '{{ my_array | first }}'
     return test(src, 'apples')
   })
@@ -153,19 +155,19 @@ describe('filters', function () {
   })
 
   it('should support join', function () {
-    var src = '{% assign beatles = "John, Paul, George, Ringo" | split: ", " %}' +
+    let src = '{% assign beatles = "John, Paul, George, Ringo" | split: ", " %}' +
       '{{ beatles | join: " and " }}'
     return test(src, 'John and Paul and George and Ringo')
   })
 
   it('should support split/last', function () {
-    var src = '{% assign my_array = "zebra, octopus, giraffe, tiger" | split: ", " %}' +
+    let src = '{% assign my_array = "zebra, octopus, giraffe, tiger" | split: ", " %}' +
       '{{ my_array|last }}'
     return test(src, 'tiger')
   })
 
   it('should support lstrip', function () {
-    var src = '{{ "          So much room for activities!          " | lstrip }}'
+    let src = '{{ "          So much room for activities!          " | lstrip }}'
     return test(src, 'So much room for activities!          ')
   })
 
@@ -191,12 +193,12 @@ describe('filters', function () {
   })
 
   it('should support string_with_newlines', function () {
-    var src = '{% capture string_with_newlines %}\n' +
+    let src = '{% capture string_with_newlines %}\n' +
             'Hello\n' +
             'there\n' +
             '{% endcapture %}' +
             '{{ string_with_newlines | newline_to_br }}'
-    var dst = '<br />' +
+    let dst = '<br />' +
             'Hello<br />' +
             'there<br />'
     return test(src, dst)
diff --git a/test/index.js b/test/index.js
index 6a1e533e0..e817f2962 100644
--- a/test/index.js
+++ b/test/index.js
@@ -5,7 +5,7 @@ const mock = require('mock-fs')
 chai.use(require('chai-as-promised'))
 
 describe('liquid', function () {
-  var engine, strictEngine, ctx
+  let engine, strictEngine, ctx
   beforeEach(function () {
     ctx = {
       name: 'harttle',
@@ -37,7 +37,7 @@ describe('liquid', function () {
   })
   describe('Liquid', function () {
     it('should ignore invalid root option', function () {
-      var liquid = Liquid({ root: /regex/ })
+      let liquid = Liquid({ root: /regex/ })
       expect(liquid.options.root).to.deep.equal([])
     })
   })
@@ -68,18 +68,18 @@ describe('liquid', function () {
     }).to.not.throw()
   })
   it('should render template multiple times', function () {
-    var template = engine.parse('{{obj}}')
+    let template = engine.parse('{{obj}}')
     return engine.render(template, ctx)
       .then(result => expect(result).to.equal('{"foo":"bar"}'))
       .then(() => engine.render(template, ctx))
       .then((result) => expect(result).to.equal('{"foo":"bar"}'))
   })
   it('should render filters', function () {
-    var template = engine.parse('<p>{{arr | join: "_"}}</p>')
+    let template = engine.parse('<p>{{arr | join: "_"}}</p>')
     return expect(engine.render(template, ctx)).to.eventually.equal('<p>-2_a</p>')
   })
   it('should render accessive filters', function () {
-    var src = '{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}' +
+    let src = '{% assign my_array = "apples, oranges, peaches, plums" | split: ", " %}' +
       '{{ my_array | first }}'
     return expect(engine.parseAndRender(src)).to.eventually.equal('apples')
   })
@@ -89,7 +89,7 @@ describe('liquid', function () {
         .to.eventually.equal('foo')
     })
     it('should find files without extname', function () {
-      var engine = Liquid({root: '/root'})
+      let engine = Liquid({root: '/root'})
       return expect(engine.renderFile('/root/files/bar', ctx))
         .to.eventually.equal('bar')
     })
@@ -106,7 +106,7 @@ describe('liquid', function () {
         .to.eventually.equal('foo')
     })
     it('should default root to cwd', function () {
-      var files = {}
+      let files = {}
       files[process.cwd() + '/foo.html'] = 'FOO'
       mock(files)
 
diff --git a/test/lexical.js b/test/lexical.js
index 2795bef87..142cc1d5d 100644
--- a/test/lexical.js
+++ b/test/lexical.js
@@ -1,7 +1,7 @@
 const chai = require('chai')
 const expect = chai.expect
 
-var lexical = require('../src/lexical.js')
+let lexical = require('../src/lexical.js')
 
 describe('lexical', function () {
   it('should test filter syntax', function () {
@@ -105,26 +105,26 @@ describe('lexical', function () {
     })
 
     it('should throw if non-literal', function () {
-      var fn = () => lexical.parseLiteral('a')
+      let fn = () => lexical.parseLiteral('a')
       expect(fn).to.throw("cannot parse 'a' as literal")
     })
   })
 
   describe('.matchValue()', function () {
     it('should match -5-5', function () {
-      var match = lexical.matchValue('-5-5')
+      let match = lexical.matchValue('-5-5')
       expect(match && match[0]).to.equal('-5-5')
     })
     it('should match 4-3', function () {
-      var match = lexical.matchValue('4-3')
+      let match = lexical.matchValue('4-3')
       expect(match && match[0]).to.equal('4-3')
     })
     it('should match 4-3', function () {
-      var match = lexical.matchValue('4-3')
+      let match = lexical.matchValue('4-3')
       expect(match && match[0]).to.equal('4-3')
     })
     it('should match var-1', function () {
-      var match = lexical.matchValue('var-1')
+      let match = lexical.matchValue('var-1')
       expect(match && match[0]).to.equal('var-1')
     })
   })
diff --git a/test/options/cache.js b/test/options/cache.js
index fbdb69a1a..92cf539fa 100644
--- a/test/options/cache.js
+++ b/test/options/cache.js
@@ -5,7 +5,7 @@ const Liquid = require('../../src')
 chai.use(require('chai-as-promised'))
 
 describe('cache options', function () {
-  var engine
+  let engine
   beforeEach(function () {
     engine = Liquid({
       root: '/root/',
diff --git a/test/options/strict.js b/test/options/strict.js
index a686feaff..7583ea5fd 100644
--- a/test/options/strict.js
+++ b/test/options/strict.js
@@ -4,8 +4,8 @@ const Liquid = require('../../src')
 chai.use(require('chai-as-promised'))
 
 describe('strict options', function () {
-  var engine
-  var ctx = {}
+  let engine
+  let ctx = {}
   beforeEach(function () {
     engine = Liquid({
       root: '/root/',
@@ -17,16 +17,16 @@ describe('strict options', function () {
       .eventually.equal('beforeafter')
   })
   it('should throw when strict_variables true', function () {
-    var tpl = engine.parse('before{{notdefined}}after')
-    var opts = {
+    let tpl = engine.parse('before{{notdefined}}after')
+    let opts = {
       strict_variables: true
     }
     return expect(engine.render(tpl, ctx, opts)).to
       .be.rejectedWith(/undefined variable: notdefined/)
   })
   it('should pass strict_variables to render by parseAndRender', function () {
-    var html = 'before{{notdefined}}after'
-    var opts = {
+    let html = 'before{{notdefined}}after'
+    let opts = {
       strict_variables: true
     }
     return expect(engine.parseAndRender(html, ctx, opts)).to
diff --git a/test/options/trimming.js b/test/options/trimming.js
index cccf5f74b..c9a2f51cc 100644
--- a/test/options/trimming.js
+++ b/test/options/trimming.js
@@ -4,59 +4,59 @@ const Liquid = require('../../src')
 chai.use(require('chai-as-promised'))
 
 describe('trimming', function () {
-  var ctx = {name: 'harttle'}
+  let ctx = {name: 'harttle'}
 
   describe('tag trimming', function () {
     it('should respect trim_tag_left', function () {
-      var engine = Liquid({ trim_tag_left: true })
+      let engine = Liquid({ trim_tag_left: true })
       return expect(engine.parseAndRender(' \n \t{%if true%}foo{%endif%} '))
         .to.eventually.equal('foo ')
     })
     it('should respect trim_tag_right', function () {
-      var engine = Liquid({ trim_tag_right: true })
+      let engine = Liquid({ trim_tag_right: true })
       return expect(engine.parseAndRender('\t{%if true%}foo{%endif%} \n'))
         .to.eventually.equal('\tfoo')
     })
     it('should not trim value', function () {
-      var engine = Liquid({ trim_tag_left: true, trim_tag_right: true })
+      let engine = Liquid({ trim_tag_left: true, trim_tag_right: true })
       return expect(engine.parseAndRender('{%if true%}a {{name}} b{%endif%}', ctx))
         .to.eventually.equal('a harttle b')
     })
   })
   describe('value trimming', function () {
     it('should respect trim_value_left', function () {
-      var engine = Liquid({ trim_value_left: true })
+      let engine = Liquid({ trim_value_left: true })
       return expect(engine.parseAndRender(' \n \t{{name}} ', ctx))
         .to.eventually.equal('harttle ')
     })
     it('should respect trim_value_right', function () {
-      var engine = Liquid({ trim_value_right: true })
+      let engine = Liquid({ trim_value_right: true })
       return expect(engine.parseAndRender(' \n \t{{name}} ', ctx))
         .to.eventually.equal(' \n \tharttle')
     })
     it('should respect not trim tag', function () {
-      var engine = Liquid({ trim_value_left: true, trim_value_right: true })
+      let engine = Liquid({ trim_value_left: true, trim_value_right: true })
       return expect(engine.parseAndRender('\t{% if true %} aha {%endif%}\t'))
         .to.eventually.equal('\t aha \t')
     })
   })
   describe('greedy', function () {
-    var src = '\n {%-if true-%}\n a \n{{-name-}}{%-endif-%}\n '
+    let src = '\n {%-if true-%}\n a \n{{-name-}}{%-endif-%}\n '
     it('should enable greedy by default', function () {
-      var engine = Liquid()
+      let engine = Liquid()
       return expect(engine.parseAndRender(src, ctx))
         .to.eventually.equal('aharttle')
     })
     it('should respect to greedy:false by default', function () {
-      var engine = Liquid({greedy: false})
+      let engine = Liquid({greedy: false})
       return expect(engine.parseAndRender(src, ctx))
         .to.eventually.equal('\n a \nharttle ')
     })
   })
   describe('markup', function () {
     it('should support trim using markup', function () {
-      var engine = Liquid()
-      var src = [
+      let engine = Liquid()
+      let src = [
         '{%- assign username = "John G. Chalmers-Smith" -%}',
         '{%- if username and username.length > 10 -%}',
         '  Wow, {{ username }}, you have a long name!',
@@ -64,12 +64,12 @@ describe('trimming', function () {
         '  Hello there!',
         '{%- endif -%}'
       ].join('\n')
-      var dst = 'Wow, John G. Chalmers-Smith, you have a long name!'
+      let dst = 'Wow, John G. Chalmers-Smith, you have a long name!'
       return expect(engine.parseAndRender(src)).to.eventually.equal(dst)
     })
     it('should not trim when not specified', function () {
-      var engine = Liquid()
-      var src = [
+      let engine = Liquid()
+      let src = [
         '{% assign username = "John G. Chalmers-Smith" %}',
         '{% if username and username.length > 10 %}',
         '  Wow, {{ username }}, you have a long name!',
@@ -77,7 +77,7 @@ describe('trimming', function () {
         '  Hello there!',
         '{% endif %}'
       ].join('\n')
-      var dst = '\n\n  Wow, John G. Chalmers-Smith, you have a long name!\n'
+      let dst = '\n\n  Wow, John G. Chalmers-Smith, you have a long name!\n'
       return expect(engine.parseAndRender(src)).to.eventually.equal(dst)
     })
   })
diff --git a/test/parser.js b/test/parser.js
index 6c62e73be..6a0b3849d 100644
--- a/test/parser.js
+++ b/test/parser.js
@@ -3,13 +3,13 @@ const expect = chai.expect
 
 chai.use(require('sinon-chai'))
 
-var filter = require('../src/filter.js')()
-var tag = require('../src/tag.js')()
-var Template = require('../src/parser.js')
+let filter = require('../src/filter.js')()
+let tag = require('../src/tag.js')()
+let Template = require('../src/parser.js')
 
 describe('template', function () {
-  var template
-  var add = (l, r) => l + r
+  let template
+  let add = (l, r) => l + r
 
   beforeEach(function () {
     filter.clear()
@@ -26,21 +26,21 @@ describe('template', function () {
   })
 
   it('should parse value string', function () {
-    var tpl = template.parseValue('foo')
+    let tpl = template.parseValue('foo')
     expect(tpl.type).to.equal('value')
     expect(tpl.initial).to.equal('foo')
     expect(tpl.filters).to.deep.equal([])
   })
 
   it('should parse value string with a simple filter', function () {
-    var tpl = template.parseValue('foo | add: 3, "foo"')
+    let tpl = template.parseValue('foo | add: 3, "foo"')
     expect(tpl.initial).to.equal('foo')
     expect(tpl.filters.length).to.equal(1)
     expect(tpl.filters[0].filter).to.equal(add)
   })
 
   it('should parse value string with filters', function () {
-    var tpl = template.parseValue('foo | add: "|" | add')
+    let tpl = template.parseValue('foo | add: "|" | add')
     expect(tpl.initial).to.equal('foo')
     expect(tpl.filters.length).to.equal(2)
   })
diff --git a/test/scope.js b/test/scope.js
index 5c0009676..8165ab1a8 100644
--- a/test/scope.js
+++ b/test/scope.js
@@ -1,11 +1,10 @@
-'use strict'
-const chai = require('chai')
+import chai from 'chai'
+import Scope from '../src/scope.js'
+
 const expect = chai.expect
 
-var Scope = require('../src/scope.js')
-
 describe('scope', function () {
-  var scope, ctx
+  let scope, ctx
   beforeEach(function () {
     ctx = {
       foo: 'zoo',
@@ -161,7 +160,7 @@ describe('scope', function () {
     })
   })
   describe('strict_variables', function () {
-    var scope
+    let scope
     beforeEach(function () {
       scope = Scope.factory(ctx, {
         strict_variables: true
diff --git a/test/syntax.js b/test/syntax.js
index 18d488bee..934832aee 100644
--- a/test/syntax.js
+++ b/test/syntax.js
@@ -1,14 +1,14 @@
 const chai = require('chai')
 const expect = chai.expect
-var syntax = require('../src/syntax.js')
-var Scope = require('../src/scope.js')
+let syntax = require('../src/syntax.js')
+let Scope = require('../src/scope.js')
 
-var evalExp = syntax.evalExp
-var evalValue = syntax.evalValue
-var isTruthy = syntax.isTruthy
+let evalExp = syntax.evalExp
+let evalValue = syntax.evalValue
+let isTruthy = syntax.isTruthy
 
 describe('expression', function () {
-  var scope
+  let scope
 
   beforeEach(function () {
     scope = Scope.factory({
@@ -36,7 +36,7 @@ describe('expression', function () {
     })
 
     it('should throw if not valid', function () {
-      var fn = () => evalValue('===')
+      let fn = () => evalValue('===')
       expect(fn).to.throw("cannot eval '===' as value")
     })
   })
diff --git a/test/tag.js b/test/tag.js
index 4dd5172aa..77df19282 100644
--- a/test/tag.js
+++ b/test/tag.js
@@ -3,11 +3,11 @@ const sinon = require('sinon')
 const expect = chai.expect
 chai.use(require('sinon-chai'))
 
-var tag = require('../src/tag.js')()
-var Scope = require('../src/scope.js')
+let tag = require('../src/tag.js')()
+let Scope = require('../src/scope.js')
 
 describe('tag', function () {
-  var scope
+  let scope
   before(function () {
     scope = Scope.factory({
       foo: 'bar',
@@ -38,7 +38,7 @@ describe('tag', function () {
   })
 
   it('should call tag.render', function () {
-    var spy = sinon.spy()
+    let spy = sinon.spy()
     tag.register('foo', {
       render: spy
     })
@@ -53,7 +53,7 @@ describe('tag', function () {
   })
 
   describe('hash', function () {
-    var spy, token
+    let spy, token
     beforeEach(function () {
       spy = sinon.spy()
       tag.register('foo', {
diff --git a/test/tags/case.js b/test/tags/case.js
index e35de1290..ef987a2ea 100644
--- a/test/tags/case.js
+++ b/test/tags/case.js
@@ -4,46 +4,46 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/case', function () {
-  var liquid = Liquid()
+  let liquid = Liquid()
 
   it('should reject if not closed', function () {
-    var src = '{% case "foo"%}'
+    let src = '{% case "foo"%}'
     return expect(liquid.parseAndRender(src))
       .to.be.rejectedWith(/{% case "foo"%} not closed/)
   })
   it('should hit the specified case', function () {
-    var src = '{% case "foo"%}' +
+    let src = '{% case "foo"%}' +
             '{% when "foo" %}foo{% when "bar"%}bar' +
             '{%endcase%}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('foo')
   })
   it('should resolve empty string if not hit', function () {
-    var src = '{% case empty %}' +
+    let src = '{% case empty %}' +
             '{% when "foo" %}foo{% when ""%}bar' +
             '{%endcase%}'
-    var ctx = {
+    let ctx = {
       empty: ''
     }
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('bar')
   })
   it('should accept empty string as branch name', function () {
-    var src = '{% case false %}' +
+    let src = '{% case false %}' +
             '{% when "foo" %}foo{% when ""%}bar' +
             '{%endcase%}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('')
   })
   it('should support boolean case', function () {
-    var src = '{% case false %}' +
+    let src = '{% case false %}' +
             '{% when "foo" %}foo{% when false%}bar' +
             '{%endcase%}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('bar')
   })
   it('should support else branch', function () {
-    var src = '{% case "a" %}' +
+    let src = '{% case "a" %}' +
             '{% when "b" %}b{% when "c"%}c{%else %}d' +
             '{%endcase%}'
     return expect(liquid.parseAndRender(src))
diff --git a/test/tags/comment.js b/test/tags/comment.js
index 87b6878c2..b428ccf99 100644
--- a/test/tags/comment.js
+++ b/test/tags/comment.js
@@ -4,29 +4,29 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/comment', function () {
-  var liquid = Liquid()
+  let liquid = Liquid()
   it('should support empty content', function () {
-    var src = '{% comment %}{% raw%}'
+    let src = '{% comment %}{% raw%}'
     return expect(liquid.parseAndRender(src))
       .to.be.rejectedWith(/{% comment %} not closed/)
   })
   it('should ignore plain string', function () {
-    var src = 'My name is {% comment %}super{% endcomment %} Shopify.'
+    let src = 'My name is {% comment %}super{% endcomment %} Shopify.'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('My name is  Shopify.')
   })
   it('should ignore output tokens', function () {
-    var src = '{% comment %}\n{{ foo}} \n{% endcomment %}'
+    let src = '{% comment %}\n{{ foo}} \n{% endcomment %}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('')
   })
   it('should ignore tag tokens', function () {
-    var src = '{% comment %}{%if true%}true{%else%}false{%endif%}{% endcomment %}'
+    let src = '{% comment %}{%if true%}true{%else%}false{%endif%}{% endcomment %}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('')
   })
   it('should ignore un-balenced tag tokens', function () {
-    var src = '{% comment %}{%if true%}true{%else%}false{% endcomment %}'
+    let src = '{% comment %}{%if true%}true{%else%}false{% endcomment %}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('')
   })
diff --git a/test/tags/cycle.js b/test/tags/cycle.js
index ac0169e13..ab2396f39 100644
--- a/test/tags/cycle.js
+++ b/test/tags/cycle.js
@@ -4,10 +4,10 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/cycle', function () {
-  var liquid = Liquid()
+  let liquid = Liquid()
 
   it('should support cycle', function () {
-    var src = "{% cycle '1', '2', '3' %}"
+    let src = "{% cycle '1', '2', '3' %}"
     return expect(liquid.parseAndRender(src + src + src + src))
       .to.eventually.equal('1231')
   })
@@ -18,8 +18,8 @@ describe('tags/cycle', function () {
   })
 
   it('should support cycle in for block', function () {
-    var src = '{% for i in (1..5) %}{% cycle one, "e"%}{% endfor %}'
-    var ctx = {
+    let src = '{% for i in (1..5) %}{% cycle one, "e"%}{% endfor %}'
+    let ctx = {
       one: 1
     }
     return expect(liquid.parseAndRender(src, ctx))
@@ -27,10 +27,10 @@ describe('tags/cycle', function () {
   })
 
   it('should support cycle group', function () {
-    var src = "{% cycle one: '1', '2', '3'%}" +
+    let src = "{% cycle one: '1', '2', '3'%}" +
             "{% cycle 1: '1', '2', '3'%}" +
             "{% cycle 2: '1', '2', '3'%}"
-    var ctx = {
+    let ctx = {
       one: 1
     }
     return expect(liquid.parseAndRender(src, ctx))
diff --git a/test/tags/decrement.js b/test/tags/decrement.js
index d2211cd77..e7c0ac4d3 100644
--- a/test/tags/decrement.js
+++ b/test/tags/decrement.js
@@ -5,10 +5,10 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/decrement', function () {
-  var liquid = Liquid()
+  let liquid = Liquid()
   it('should throw when variable expression illegal', function () {
-    var src = '{% decrement / %}{{var}}'
-    var ctx = {}
+    let src = '{% decrement / %}{{var}}'
+    let ctx = {}
     return expect(liquid.parseAndRender(src, ctx)).to.be.rejectedWith(/illegal/)
   })
 
diff --git a/test/tags/for.js b/test/tags/for.js
index 7719a6c6e..682598d47 100644
--- a/test/tags/for.js
+++ b/test/tags/for.js
@@ -4,7 +4,7 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/for', function () {
-  var liquid, ctx
+  let liquid, ctx
   before(function () {
     liquid = Liquid()
     liquid.registerTag('throwingTag', {
@@ -22,25 +22,25 @@ describe('tags/for', function () {
     }
   })
   it('should support array', function () {
-    var src = '{%for c in alpha%}{{c}}{%endfor%}'
+    let src = '{%for c in alpha%}{{c}}{%endfor%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('abc')
   })
 
   it('should support object', function () {
-    var src = '{%for item in obj%}{{item[0]}},{{item[1]}}-{%else%}b{%endfor%}'
+    let src = '{%for item in obj%}{{item[0]}},{{item[1]}}-{%else%}b{%endfor%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('foo,bar-coo,haa-')
   })
 
   describe('scope', function () {
     it('should read super scope', function () {
-      var src = '{%for a in (1..2)%}{{num}}{%endfor%}'
+      let src = '{%for a in (1..2)%}{{num}}{%endfor%}'
       return expect(liquid.parseAndRender(src, {num: 1}))
         .to.eventually.equal('11')
     })
     it('should write super scope', function () {
-      var src = '{%for a in (1..2)%}{{num}}{%assign num = 2%}{%endfor%}'
+      let src = '{%for a in (1..2)%}{{num}}{%assign num = 2%}{%endfor%}'
       return expect(liquid.parseAndRender(src, {num: 1}))
         .to.eventually.equal('12')
     })
@@ -48,13 +48,13 @@ describe('tags/for', function () {
 
   describe('illegal', function () {
     it('should reject when for not closed', function () {
-      var src = '{%for c in alpha%}{{c}}'
+      let src = '{%for c in alpha%}{{c}}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.be.rejectedWith(/tag .* not closed/)
     })
 
     it('should reject when inner templates rejected', function () {
-      var src = '{%for c in alpha%}{%throwingTag%}{%endfor%}'
+      let src = '{%for c in alpha%}{%throwingTag%}{%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.be.rejectedWith(/intended render error/)
     })
@@ -62,51 +62,51 @@ describe('tags/for', function () {
 
   describe('else', function () {
     it('should goto else for empty array', function () {
-      var src = '{%for c in emptyArray%}a{%else%}b{%endfor%}'
+      let src = '{%for c in emptyArray%}a{%else%}b{%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('b')
     })
 
     it('should treat non-empty string as one single element', function () {
-      var src = '{%for c in "abc"%}x{{c}}{%else%}y{%endfor%}'
+      let src = '{%for c in "abc"%}x{{c}}{%else%}y{%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('xabc')
     })
 
     it('should goto else for empty string', function () {
-      var src = '{%for c in ""%}a{%else%}b{%endfor%}'
+      let src = '{%for c in ""%}a{%else%}b{%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('b')
     })
 
     it('should goto else for empty string object', function () {
       // it should be false although `new String` is none-conform
-      var src = '{%for c in strObj%}a{%else%}b{%endfor%}'
+      let src = '{%for c in strObj%}a{%else%}b{%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('b')
     })
 
     it('should goto else for empty object', function () {
-      var src = '{%for c in emptyObj%}a{%else%}b{%endfor%}'
+      let src = '{%for c in emptyObj%}a{%else%}b{%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('b')
     })
 
     it('should goto else for null-prototyped object', function () {
-      var src = '{%for c in nullProtoObj%}a{%else%}b{%endfor%}'
+      let src = '{%for c in nullProtoObj%}a{%else%}b{%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('b')
     })
   })
 
   it('should support for with forloop', function () {
-    var src = '{%for c in alpha%}' +
+    let src = '{%for c in alpha%}' +
             '{{forloop.first}}.{{forloop.index}}.{{forloop.index0}}.' +
             '{{forloop.last}}.{{forloop.length}}.' +
             '{{forloop.rindex}}.{{forloop.rindex0}}' +
             '{{c}}\n' +
             '{%endfor%}'
-    var dst = 'true.1.0.false.3.3.2a\n' +
+    let dst = 'true.1.0.false.3.3.2a\n' +
             'false.2.1.false.3.2.1b\n' +
             'false.3.2.true.3.1.0c\n'
     return expect(liquid.parseAndRender(src, ctx))
@@ -114,14 +114,14 @@ describe('tags/for', function () {
   })
 
   it('should support for with continue', function () {
-    var src = '{% for i in (1..5) %}' +
+    let src = '{% for i in (1..5) %}' +
             '{{i}}{% continue %}after' +
             '{% endfor %}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('12345')
   })
   it('should support for with break', function () {
-    var src = '{% for i in (one..5) %}' +
+    let src = '{% for i in (one..5) %}' +
       '{% if i == 4 %}{% break %}{% endif %}' +
       '{{ i }}' +
       '{% endfor %}'
@@ -131,22 +131,22 @@ describe('tags/for', function () {
 
   describe('limit', function () {
     it('should support for with limit', function () {
-      var src = '{% for i in (1..5) limit:2 %}{{ i }}{% endfor %}'
+      let src = '{% for i in (1..5) limit:2 %}{{ i }}{% endfor %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('12')
     })
     it('should set forloop.last properly', function () {
-      var src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.last}} {%endfor%}'
+      let src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.last}} {%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('false true ')
     })
     it('should set forloop.first properly', function () {
-      var src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.first}} {%endfor%}'
+      let src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.first}} {%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('true false ')
     })
     it('should set forloop.length properly', function () {
-      var src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.length}} {%endfor%}'
+      let src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.length}} {%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('2 2 ')
     })
@@ -154,27 +154,27 @@ describe('tags/for', function () {
 
   describe('offset', function () {
     it('should support offset with limit', function () {
-      var src = '{% for i in (1..10) limit:2 offset:5%}{{ i }}{% endfor %}'
+      let src = '{% for i in (1..10) limit:2 offset:5%}{{ i }}{% endfor %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('67')
     })
     it('should set index properly', function () {
-      var src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.index}} {%endfor%}'
+      let src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.index}} {%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('1 2 ')
     })
     it('should set index0 properly', function () {
-      var src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.index0}} {%endfor%}'
+      let src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.index0}} {%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('0 1 ')
     })
     it('should set rindex properly', function () {
-      var src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.rindex}} {%endfor%}'
+      let src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.rindex}} {%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('2 1 ')
     })
     it('should set rindex0 properly', function () {
-      var src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.rindex0}} {%endfor%}'
+      let src = '{%for i in (1..10) limit:2 offset:3%}{{forloop.rindex0}} {%endfor%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('1 0 ')
     })
@@ -182,19 +182,19 @@ describe('tags/for', function () {
 
   describe('reverse', function () {
     it('should support for reversed in the last position', function () {
-      var src = '{% for i in (1..5) limit:2 reversed %}{{ i }}{% endfor %}'
+      let src = '{% for i in (1..5) limit:2 reversed %}{{ i }}{% endfor %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('21')
     })
 
     it('should support for reversed in the first position', function () {
-      var src = '{% for i in (1..5) reversed limit:2 %}{{ i }}{% endfor %}'
+      let src = '{% for i in (1..5) reversed limit:2 %}{{ i }}{% endfor %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('21')
     })
 
     it('should support for reversed in the middle position', function () {
-      var src = '{% for i in (1..5) offset:2 reversed limit:4 %}{{ i }}{% endfor %}'
+      let src = '{% for i in (1..5) offset:2 reversed limit:4 %}{{ i }}{% endfor %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('543')
     })
diff --git a/test/tags/if.js b/test/tags/if.js
index b38886688..be3dc8106 100644
--- a/test/tags/if.js
+++ b/test/tags/if.js
@@ -4,8 +4,8 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/if', function () {
-  var liquid = Liquid()
-  var ctx = {
+  let liquid = Liquid()
+  let ctx = {
     one: 1,
     two: 2,
     emptyString: '',
@@ -13,101 +13,101 @@ describe('tags/if', function () {
   }
 
   it('should throw if not closed', function () {
-    var src = '{% if false%}yes'
+    let src = '{% if false%}yes'
     return expect(liquid.parseAndRender(src, ctx))
       .to.be.rejectedWith(/tag {% if false%} not closed/)
   })
   it('should support nested', function () {
-    var src = '{%if false%}{%if true%}{%else%}a{%endif%}{%endif%}'
+    let src = '{%if false%}{%if true%}{%else%}a{%endif%}{%endif%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('')
   })
 
   describe('single value as condition', function () {
     it('should support boolean', function () {
-      var src = '{% if false %}1{%elsif true%}2{%else%}3{%endif%}'
+      let src = '{% if false %}1{%elsif true%}2{%else%}3{%endif%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('2')
     })
     it('should treat Array truthy', function () {
-      var src = '{%if emptyArray%}a{%endif%}'
+      let src = '{%if emptyArray%}a{%endif%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('a')
     })
     it('should return true if empty string', function () {
-      var src = '{%if emptyString%}a{%endif%}'
+      let src = '{%if emptyString%}a{%endif%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('a')
     })
   })
   describe('expression as condition', function () {
     it('should support ==', function () {
-      var src = '{% if 2==3 %}yes{%else%}no{%endif%}'
+      let src = '{% if 2==3 %}yes{%else%}no{%endif%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
     it('should support >=', function () {
-      var src = '{% if 1>=2 and one<two %}a{%endif%}'
+      let src = '{% if 1>=2 and one<two %}a{%endif%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('')
     })
     it('should support !=', function () {
-      var src = '{% if one!=two %}yes{%else%}no{%endif%}'
+      let src = '{% if one!=two %}yes{%else%}no{%endif%}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('yes')
     })
     it('should support value and expression', function () {
-      var src = `X{%if version and version != '' %}x{{version}}y{%endif%}Y`
-      var ctx = { 'version': '' }
+      let src = `X{%if version and version != '' %}x{{version}}y{%endif%}Y`
+      let ctx = { 'version': '' }
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('XY')
     })
   })
   describe('comparasion to null', function () {
     it('should evaluate false for null < 10', function () {
-      var src = '{% if null < 10 %}yes{% else %}no{% endif %}'
+      let src = '{% if null < 10 %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
 
     it('should evaluate false for null > 10', function () {
-      var src = '{% if null > 10 %}yes{% else %}no{% endif %}'
+      let src = '{% if null > 10 %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
 
     it('should evaluate false for null <= 10', function () {
-      var src = '{% if null <= 10 %}yes{% else %}no{% endif %}'
+      let src = '{% if null <= 10 %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
 
     it('should evaluate false for null >= 10', function () {
-      var src = '{% if null >= 10 %}yes{% else %}no{% endif %}'
+      let src = '{% if null >= 10 %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
 
     it('should evaluate false for 10 < null', function () {
-      var src = '{% if 10 < null %}yes{% else %}no{% endif %}'
+      let src = '{% if 10 < null %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
 
     it('should evaluate false for 10 > null', function () {
-      var src = '{% if 10 > null %}yes{% else %}no{% endif %}'
+      let src = '{% if 10 > null %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
 
     it('should evaluate false for 10 <= null', function () {
-      var src = '{% if 10 <= null %}yes{% else %}no{% endif %}'
+      let src = '{% if 10 <= null %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
 
     it('should evaluate false for 10 >= null', function () {
-      var src = '{% if 10 >= null %}yes{% else %}no{% endif %}'
+      let src = '{% if 10 >= null %}yes{% else %}no{% endif %}'
       return expect(liquid.parseAndRender(src, ctx))
         .to.eventually.equal('no')
     })
diff --git a/test/tags/include.js b/test/tags/include.js
index af52a046c..0327d26fd 100644
--- a/test/tags/include.js
+++ b/test/tags/include.js
@@ -5,7 +5,7 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/include', function () {
-  var liquid
+  let liquid
   before(function () {
     liquid = Liquid({
       root: '/',
@@ -94,7 +94,7 @@ describe('tags/include', function () {
       '/card.html': '<p>{{person.firstName}} {{person.lastName}}<br/>{% include "address" %}</p>',
       '/address.html': 'City: {{person.address.city}}'
     })
-    var ctx = {
+    let ctx = {
       person: {
         firstName: 'Joe',
         lastName: 'Shmoe',
@@ -113,7 +113,7 @@ describe('tags/include', function () {
         '/parent.html': 'X{% include child.html color:"red" %}Y',
         '/child.html': 'child with {{color}}'
       })
-      var staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
+      let staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
       return expect(staticLiquid.renderFile('parent.html')).to
         .eventually.equal('Xchild with redY')
     })
@@ -123,7 +123,7 @@ describe('tags/include', function () {
         '/parent.html': 'X{% include bar/./../foo/child.html %}Y',
         '/foo/child.html': 'child'
       })
-      var staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
+      let staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
       return expect(staticLiquid.renderFile('parent.html')).to
         .eventually.equal('XchildY')
     })
@@ -133,7 +133,7 @@ describe('tags/include', function () {
         '/parent.html': 'X{% include foo/child.html %}Y',
         '/foo/child.html': 'child'
       })
-      var staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
+      let staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
       return expect(staticLiquid.renderFile('parent.html')).to
         .eventually.equal('XchildY')
     })
@@ -143,7 +143,7 @@ describe('tags/include', function () {
         '/parent.html': 'X{% include child.html, color:"red" %}Y',
         '/child.html': 'child with {{color}}'
       })
-      var staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
+      let staticLiquid = new Liquid({dynamicPartials: false, root: '/'})
       return expect(staticLiquid.renderFile('parent.html')).to
         .eventually.equal('Xchild with redY')
     })
diff --git a/test/tags/layout.js b/test/tags/layout.js
index 8804e306a..7c98d04f9 100644
--- a/test/tags/layout.js
+++ b/test/tags/layout.js
@@ -5,7 +5,7 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/layout', function () {
-  var liquid
+  let liquid
   before(function () {
     liquid = Liquid({
       root: '/',
@@ -20,7 +20,7 @@ describe('tags/layout', function () {
     mock({
       '/parent.html': 'parent'
     })
-    var src = '{% layout "parent" %}{%block%}A'
+    let src = '{% layout "parent" %}{%block%}A'
     return expect(liquid.parseAndRender(src)).to
       .be.rejectedWith(/tag {%block%} not closed/)
   })
@@ -38,7 +38,7 @@ describe('tags/layout', function () {
       mock({
         '/parent.html': 'X{%block%}{%endblock%}Y'
       })
-      var src = '{% layout "parent.html" %}{%block%}A{%endblock%}'
+      let src = '{% layout "parent.html" %}{%block%}A{%endblock%}'
       return expect(liquid.parseAndRender(src)).to
         .eventually.equal('XAY')
     })
@@ -46,7 +46,7 @@ describe('tags/layout', function () {
       mock({
         '/parent.html': 'X{%block%}{%endblock%}Y'
       })
-      var src = '{% layout "parent.html" %}A'
+      let src = '{% layout "parent.html" %}A'
       return expect(liquid.parseAndRender(src)).to
         .eventually.equal('XAY')
     })
@@ -55,7 +55,7 @@ describe('tags/layout', function () {
     mock({
       '/parent.html': 'X{% block "a"%}{% endblock %}Y{% block b%}{%endblock%}Z'
     })
-    var src = '{% layout "parent.html" %}' +
+    let src = '{% layout "parent.html" %}' +
       '{%block a%}A{%endblock%}' +
       '{%block b%}B{%endblock%}'
     return expect(liquid.parseAndRender(src)).to
@@ -65,7 +65,7 @@ describe('tags/layout', function () {
     mock({
       '/parent.html': 'X{% block "a"%}A{% endblock %}Y{% block b%}B{%endblock%}Z'
     })
-    var src = '{% layout "parent.html" %}{%block a%}a{%endblock%}'
+    let src = '{% layout "parent.html" %}{%block a%}a{%endblock%}'
     return expect(liquid.parseAndRender(src)).to
       .eventually.equal('XaYBZ')
   })
@@ -112,7 +112,7 @@ describe('tags/layout', function () {
         '/parent.html': '{{color}}{%block%}{%endblock%}',
         '/main.html': '{% layout parent.html color:"black"%}{%block%}A{%endblock%}'
       })
-      var staticLiquid = Liquid({ root: '/', dynamicPartials: false })
+      let staticLiquid = Liquid({ root: '/', dynamicPartials: false })
       return expect(staticLiquid.renderFile('/main.html')).to
         .eventually.equal('blackA')
     })
@@ -122,7 +122,7 @@ describe('tags/layout', function () {
         '/foo/parent.html': '{{color}}{%block%}{%endblock%}',
         '/main.html': '{% layout bar/../foo/parent.html color:"black"%}{%block%}A{%endblock%}'
       })
-      var staticLiquid = Liquid({ root: '/', dynamicPartials: false })
+      let staticLiquid = Liquid({ root: '/', dynamicPartials: false })
       return expect(staticLiquid.renderFile('/main.html')).to
         .eventually.equal('blackA')
     })
@@ -132,7 +132,7 @@ describe('tags/layout', function () {
         '/foo/parent.html': '{{color}}{%block%}{%endblock%}',
         '/main.html': '{% layout foo/parent.html color:"black"%}{%block%}A{%endblock%}'
       })
-      var staticLiquid = Liquid({ root: '/', dynamicPartials: false })
+      let staticLiquid = Liquid({ root: '/', dynamicPartials: false })
       return expect(staticLiquid.renderFile('/main.html')).to
         .eventually.equal('blackA')
     })
diff --git a/test/tags/raw.js b/test/tags/raw.js
index d7886986f..a367d57c7 100644
--- a/test/tags/raw.js
+++ b/test/tags/raw.js
@@ -4,20 +4,20 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/raw', function () {
-  var liquid = Liquid()
+  let liquid = Liquid()
   it('should support raw 1', function () {
     return expect(liquid.parseAndRender('{% raw%}'))
       .to.be.rejectedWith(/{% raw%} not closed/)
   })
   it('should support raw 2', function () {
-    var src = '{% raw %}{{ 5 | plus: 6 }}{% endraw %} is equal to 11.'
-    var dst = '{{ 5 | plus: 6 }} is equal to 11.'
+    let src = '{% raw %}{{ 5 | plus: 6 }}{% endraw %} is equal to 11.'
+    let dst = '{{ 5 | plus: 6 }} is equal to 11.'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal(dst)
   })
   it('should support raw 3', function () {
-    var src = '{% raw %}\n{{ foo}} \n{% endraw %}'
-    var dst = '\n{{ foo}} \n'
+    let src = '{% raw %}\n{{ foo}} \n{% endraw %}'
+    let dst = '\n{{ foo}} \n'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal(dst)
   })
diff --git a/test/tags/tablerow.js b/test/tags/tablerow.js
index 2efe3345c..8c6c413a6 100644
--- a/test/tags/tablerow.js
+++ b/test/tags/tablerow.js
@@ -4,52 +4,52 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/tablerow', function () {
-  var liquid = Liquid()
+  let liquid = Liquid()
 
   it('should support tablerow', function () {
-    var src = '{% tablerow i in (1..3)%}{{ i }}{% endtablerow %}'
-    var dst = '<tr class="row1"><td class="col1">1</td><td class="col2">2</td><td class="col3">3</td></tr>'
+    let src = '{% tablerow i in (1..3)%}{{ i }}{% endtablerow %}'
+    let dst = '<tr class="row1"><td class="col1">1</td><td class="col2">2</td><td class="col3">3</td></tr>'
     return expect(liquid.parseAndRender(src)).to.eventually.equal(dst)
   })
 
   it('should support cols', function () {
-    var src = '{% tablerow i in alpha cols:2 %}{{ i }}{% endtablerow %}'
-    var ctx = {
+    let src = '{% tablerow i in alpha cols:2 %}{{ i }}{% endtablerow %}'
+    let ctx = {
       alpha: ['a', 'b', 'c']
     }
-    var dst =
+    let dst =
       '<tr class="row1"><td class="col1">a</td><td class="col2">b</td></tr>' +
       '<tr class="row2"><td class="col1">c</td></tr>'
     return expect(liquid.parseAndRender(src, ctx)).to.eventually.equal(dst)
   })
 
   it('should support cols set to 0', function () {
-    var src = '{% tablerow i in (1..3) cols:0 %}{{ i }}{% endtablerow %}'
-    var dst = '<tr class="row1"><td class="col1">1</td><td class="col2">2</td><td class="col3">3</td></tr>'
+    let src = '{% tablerow i in (1..3) cols:0 %}{{ i }}{% endtablerow %}'
+    let dst = '<tr class="row1"><td class="col1">1</td><td class="col2">2</td><td class="col3">3</td></tr>'
     return expect(liquid.parseAndRender(src)).to.eventually.equal(dst)
   })
 
   it('should support empty tablerow', function () {
-    var src = '{% tablerow i in (1..0) cols:2 %}{{ i }}{% endtablerow %}'
-    var dst = ''
+    let src = '{% tablerow i in (1..0) cols:2 %}{{ i }}{% endtablerow %}'
+    let dst = ''
     return expect(liquid.parseAndRender(src)).to.eventually.equal(dst)
   })
 
   it('should support empty array', function () {
-    var src = '{% tablerow i in alpha.z cols:2 %}{{ i }}{% endtablerow %}'
-    var dst = ''
+    let src = '{% tablerow i in alpha.z cols:2 %}{{ i }}{% endtablerow %}'
+    let dst = ''
     return expect(liquid.parseAndRender(src)).to.eventually.equal(dst)
   })
 
   it('should throw when tablerow not closed', function () {
-    var src = '{% tablerow i in (1..0) cols:2 %}{{ i }}'
+    let src = '{% tablerow i in (1..0) cols:2 %}{{ i }}'
     return expect(liquid.parseAndRender(src))
       .to.be.rejectedWith(/tag .* not closed/)
   })
 
   it('should support tablerow with range', function () {
-    var src = '{% tablerow i in (1..5) cols:2 %}{{ i }}{% endtablerow %}'
-    var dst =
+    let src = '{% tablerow i in (1..5) cols:2 %}{{ i }}{% endtablerow %}'
+    let dst =
       '<tr class="row1"><td class="col1">1</td><td class="col2">2</td></tr>' +
       '<tr class="row2"><td class="col1">3</td><td class="col2">4</td></tr>' +
       '<tr class="row3"><td class="col1">5</td></tr>'
@@ -57,16 +57,16 @@ describe('tags/tablerow', function () {
   })
 
   it('should support tablerow with limit', function () {
-    var src = '{% tablerow i in (1..5) cols:2 limit:3 %}{{ i }}{% endtablerow %}'
-    var dst =
+    let src = '{% tablerow i in (1..5) cols:2 limit:3 %}{{ i }}{% endtablerow %}'
+    let dst =
       '<tr class="row1"><td class="col1">1</td><td class="col2">2</td></tr>' +
       '<tr class="row2"><td class="col1">3</td></tr>'
     return expect(liquid.parseAndRender(src)).to.eventually.equal(dst)
   })
 
   it('should support tablerow with offset', function () {
-    var src = '{% tablerow i in (1..5) cols:2 offset:3 %}{{ i }}{% endtablerow %}'
-    var dst = '<tr class="row1"><td class="col1">4</td><td class="col2">5</td></tr>'
+    let src = '{% tablerow i in (1..5) cols:2 offset:3 %}{{ i }}{% endtablerow %}'
+    let dst = '<tr class="row1"><td class="col1">4</td><td class="col2">5</td></tr>'
     return expect(liquid.parseAndRender(src)).to.eventually.equal(dst)
   })
 })
diff --git a/test/tags/unless.js b/test/tags/unless.js
index b0b6287e4..5c7d6c437 100644
--- a/test/tags/unless.js
+++ b/test/tags/unless.js
@@ -4,31 +4,31 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
 describe('tags/unless', function () {
-  var liquid = Liquid()
+  let liquid = Liquid()
 
   it('should render else when predicate yields true', function () {
     // 0 is truthy
-    var src = '{% unless 0 %}yes{%else%}no{%endunless%}'
+    let src = '{% unless 0 %}yes{%else%}no{%endunless%}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('no')
   })
   it('should render unless when predicate yields false', function () {
-    var src = '{% unless false %}yes{%else%}no{%endunless%}'
+    let src = '{% unless false %}yes{%else%}no{%endunless%}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('yes')
   })
   it('should reject when tag not closed', function () {
-    var src = '{% unless 1>2 %}yes'
+    let src = '{% unless 1>2 %}yes'
     return expect(liquid.parseAndRender(src))
       .to.be.rejectedWith(/tag {% unless 1>2 %} not closed/)
   })
   it('should render unless when predicate yields false and else undefined', function () {
-    var src = '{% unless 1>2 %}yes{%endunless%}'
+    let src = '{% unless 1>2 %}yes{%endunless%}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('yes')
   })
   it('should render "" when predicate yields false and else undefined', function () {
-    var src = '{% unless 1<2 %}yes{%endunless%}'
+    let src = '{% unless 1<2 %}yes{%endunless%}'
     return expect(liquid.parseAndRender(src))
       .to.eventually.equal('')
   })
diff --git a/test/tokenizer.js b/test/tokenizer.js
index ab85ef426..fa80e6a6e 100644
--- a/test/tokenizer.js
+++ b/test/tokenizer.js
@@ -5,8 +5,8 @@ const expect = chai.expect
 describe('tokenizer', function () {
   describe('parse', function () {
     it('should handle plain HTML', function () {
-      var html = '<html><body><p>Lorem Ipsum</p></body></html>'
-      var tokens = parse(html)
+      let html = '<html><body><p>Lorem Ipsum</p></body></html>'
+      let tokens = parse(html)
 
       expect(tokens.length).to.equal(1)
       expect(tokens[0].value).to.equal(html)
@@ -18,24 +18,24 @@ describe('tokenizer', function () {
       }).to.throw('illegal input')
     })
     it('should handle tag syntax', function () {
-      var html = '<p>{% for p in a[1]%}</p>'
-      var tokens = parse(html)
+      let html = '<p>{% for p in a[1]%}</p>'
+      let tokens = parse(html)
 
       expect(tokens.length).to.equal(3)
       expect(tokens[1].type).to.equal('tag')
       expect(tokens[1].value).to.equal('for p in a[1]')
     })
     it('should handle value syntax', function () {
-      var html = '<p>{{foo | date: "%Y-%m-%d"}}</p>'
-      var tokens = parse(html)
+      let html = '<p>{{foo | date: "%Y-%m-%d"}}</p>'
+      let tokens = parse(html)
 
       expect(tokens.length).to.equal(3)
       expect(tokens[1].type).to.equal('value')
       expect(tokens[1].value).to.equal('foo | date: "%Y-%m-%d"')
     })
     it('should handle consecutive value and tags', function () {
-      var html = '{{foo}}{{bar}}{%foo%}{%bar%}'
-      var tokens = parse(html)
+      let html = '{{foo}}{{bar}}{%foo%}{%bar%}'
+      let tokens = parse(html)
 
       expect(tokens.length).to.equal(4)
       expect(tokens[0].type).to.equal('value')
@@ -45,8 +45,8 @@ describe('tokenizer', function () {
       expect(tokens[2].value).to.equal('foo')
     })
     it('should keep white spaces and newlines', function () {
-      var html = '{%foo%}\n{%bar %}  \n {%alice%}'
-      var tokens = parse(html)
+      let html = '{%foo%}\n{%bar %}  \n {%alice%}'
+      let tokens = parse(html)
       expect(tokens.length).to.equal(5)
       expect(tokens[1].type).to.equal('html')
       expect(tokens[1].raw).to.equal('\n')
@@ -54,16 +54,16 @@ describe('tokenizer', function () {
       expect(tokens[3].raw).to.equal('  \n ')
     })
     it('should handle multiple lines tag', function () {
-      var html = '{%foo\na:a\nb:1.23\n%}'
-      var tokens = parse(html)
+      let html = '{%foo\na:a\nb:1.23\n%}'
+      let tokens = parse(html)
       expect(tokens.length).to.equal(1)
       expect(tokens[0].type).to.equal('tag')
       expect(tokens[0].args).to.equal('a:a\nb:1.23')
       expect(tokens[0].raw).to.equal('{%foo\na:a\nb:1.23\n%}')
     })
     it('should handle multiple lines value', function () {
-      var html = '{{foo\n|date:\n"%Y-%m-%d"\n}}'
-      var tokens = parse(html)
+      let html = '{{foo\n|date:\n"%Y-%m-%d"\n}}'
+      let tokens = parse(html)
       expect(tokens.length).to.equal(1)
       expect(tokens[0].type).to.equal('value')
       expect(tokens[0].raw).to.equal('{{foo\n|date:\n"%Y-%m-%d"\n}}')
diff --git a/test/util/assert.js b/test/util/assert.js
index fe0c6acc5..083b2f819 100644
--- a/test/util/assert.js
+++ b/test/util/assert.js
@@ -4,15 +4,15 @@ const assert = require('../../src/util/assert.js')
 
 describe('assert', function () {
   it('should not throw if predicate is truthy', function () {
-    var fn = () => assert('foo', 'bar')
+    let fn = () => assert('foo', 'bar')
     expect(fn).to.not.throw()
   })
   it('should not throw if predicate is truthy', function () {
-    var fn = () => assert('', 'bar')
+    let fn = () => assert('', 'bar')
     expect(fn).to.throw(/bar/)
   })
   it('should populate default message', function () {
-    var fn = () => assert(false)
+    let fn = () => assert(false)
     expect(fn).to.throw(/expect false to be true/)
   })
 })
diff --git a/test/util/error.js b/test/util/error.js
index a09a053dc..bfcf5f50d 100644
--- a/test/util/error.js
+++ b/test/util/error.js
@@ -4,8 +4,8 @@ const mock = require('mock-fs')
 const path = require('path')
 chai.use(require('chai-as-promised'))
 
-var engine = require('../..')()
-var strictEngine = require('../..')({
+let engine = require('../..')()
+let strictEngine = require('../..')({
   strict_variables: true,
   strict_filters: true
 })
@@ -25,8 +25,8 @@ describe('error', function () {
         })
     })
     it('should contain template content in err.message', function () {
-      var html = ['1st', '2nd', 'X{% . a %} Y', '4th']
-      var message = [
+      let html = ['1st', '2nd', 'X{% . a %} Y', '4th']
+      let message = [
         '   1| 1st',
         '   2| 2nd',
         '>> 3| X{% . a %} Y',
@@ -42,7 +42,7 @@ describe('error', function () {
         })
     })
     it('should contain the whole template content in err.input', function () {
-      var html = 'bar\nfoo{% . a %}\nfoo'
+      let html = 'bar\nfoo{% . a %}\nfoo'
       return expect(engine.parseAndRender(html)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -66,7 +66,7 @@ describe('error', function () {
         })
     })
     describe('captureStackTrace compatibility', function () {
-      var captureStackTrace = Error.captureStackTrace
+      let captureStackTrace = Error.captureStackTrace
       before(() => (Error.captureStackTrace = null))
       after(() => (Error.captureStackTrace = captureStackTrace))
       it('should use empty string if captureStackTrace not defined', function () {
@@ -79,7 +79,7 @@ describe('error', function () {
       })
     })
     it('should contain file path in err.file', function () {
-      var html = '<html>\n<head>\n\n{% . a %}\n\n'
+      let html = '<html>\n<head>\n\n{% . a %}\n\n'
       mock({
         '/foo.html': html
       })
@@ -113,7 +113,7 @@ describe('error', function () {
       })
     })
     it('should throw RenderError when tag throws', function () {
-      var src = '{%throwingTag%}'
+      let src = '{%throwingTag%}'
       return expect(engine.parseAndRender(src)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -122,7 +122,7 @@ describe('error', function () {
         })
     })
     it('should throw RenderError when tag rejects', function () {
-      var src = '{%rejectingTag%}'
+      let src = '{%rejectingTag%}'
       return expect(engine.parseAndRender(src)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -131,7 +131,7 @@ describe('error', function () {
         })
     })
     it('should throw RenderError when filter throws', function () {
-      var src = '{{1|throwingFilter}}'
+      let src = '{{1|throwingFilter}}'
       return expect(engine.parseAndRender(src)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -151,8 +151,8 @@ describe('error', function () {
         })
     })
     it('should contain template context in err.stack', function () {
-      var html = ['1st', '2nd', '3rd', 'X{%throwingTag%} Y', '5th', '6th', '7th']
-      var message = [
+      let html = ['1st', '2nd', '3rd', 'X{%throwingTag%} Y', '5th', '6th', '7th']
+      let message = [
         '   2| 2nd',
         '   3| 3rd',
         '>> 4| X{%throwingTag%} Y',
@@ -181,8 +181,8 @@ describe('error', function () {
           '7th'
         ].join('\n')
       })
-      var html = '{%layout "throwing-tag.html"%}'
-      var message = [
+      let html = '{%layout "throwing-tag.html"%}'
+      let message = [
         '   2| 2nd',
         '   3| 3rd',
         '>> 4| X{%throwingTag%} Y',
@@ -202,12 +202,12 @@ describe('error', function () {
         })
     })
     it('should contain original error info for {% include %}', function () {
-      var origin = ['1st', '2nd', '3rd', 'X{%throwingTag%} Y', '5th', '6th', '7th']
+      let origin = ['1st', '2nd', '3rd', 'X{%throwingTag%} Y', '5th', '6th', '7th']
       mock({
         '/throwing-tag.html': origin.join('\n')
       })
-      var html = '{%include "throwing-tag.html"%}'
-      var message = [
+      let html = '{%include "throwing-tag.html"%}'
+      let message = [
         '   2| 2nd',
         '   3| 3rd',
         '>> 4| X{%throwingTag%} Y',
@@ -225,7 +225,7 @@ describe('error', function () {
         })
     })
     it('should contain the whole template content in err.input', function () {
-      var html = 'bar\nfoo{%throwingTag%}\nfoo'
+      let html = 'bar\nfoo{%throwingTag%}\nfoo'
       return expect(engine.parseAndRender(html)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -234,7 +234,7 @@ describe('error', function () {
         })
     })
     it('should contain line number in err.line', function () {
-      var src = '1\n2\n{{1|throwingFilter}}\n4'
+      let src = '1\n2\n{{1|throwingFilter}}\n4'
       return expect(engine.parseAndRender(src)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -252,7 +252,7 @@ describe('error', function () {
     })
 
     it('should contain file path in err.file', function () {
-      var html = '<html>\n<head>\n\n{% throwingTag %}\n\n'
+      let html = '<html>\n<head>\n\n{% throwingTag %}\n\n'
       mock({
         '/foo.html': html
       })
@@ -293,7 +293,7 @@ describe('error', function () {
         })
     })
     it('should throw ParseError when tag parse throws', function () {
-      var src = '{%throwsOnParse%}'
+      let src = '{%throwsOnParse%}'
       return expect(engine.parseAndRender(src)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -302,7 +302,7 @@ describe('error', function () {
         })
     })
     it('should throw ParseError when tag not found', function () {
-      var src = '{%if true%}\naaa{%endif%}\n{% -a %}\n3'
+      let src = '{%if true%}\naaa{%endif%}\n{% -a %}\n3'
       return expect(engine.parseAndRender(src)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -321,8 +321,8 @@ describe('error', function () {
     })
 
     it('should contain template context in err.stack', function () {
-      var html = ['1st', '2nd', '3rd', 'X{% a %} {% enda %} Y', '5th', '6th', '7th']
-      var message = [
+      let html = ['1st', '2nd', '3rd', 'X{% a %} {% enda %} Y', '5th', '6th', '7th']
+      let message = [
         '   2| 2nd',
         '   3| 3rd',
         '>> 4| X{% a %} {% enda %} Y',
@@ -341,8 +341,8 @@ describe('error', function () {
     })
 
     it('should handle err.message when context not enough', function () {
-      var html = ['1st', 'X{% a %} {% enda %} Y', '3rd', '4th']
-      var message = [
+      let html = ['1st', 'X{% a %} {% enda %} Y', '3rd', '4th']
+      let message = [
         '   1| 1st',
         '>> 2| X{% a %} {% enda %} Y',
         '   3| 3rd',
@@ -358,7 +358,7 @@ describe('error', function () {
     })
 
     it('should contain line number in err.line', function () {
-      var html = '<html>\n<head>\n\n{% raw %}\n\n'
+      let html = '<html>\n<head>\n\n{% raw %}\n\n'
       return expect(engine.parseAndRender(html)).to.eventually
         .be.rejected
         .then(function (err) {
@@ -376,7 +376,7 @@ describe('error', function () {
     })
 
     it('should contain file path in err.file', function () {
-      var html = '<html>\n<head>\n\n{% raw %}\n\n'
+      let html = '<html>\n<head>\n\n{% raw %}\n\n'
       mock({
         '/foo.html': html
       })
diff --git a/test/util/promise.js b/test/util/promise.js
index c43b9c761..bc9814ccf 100644
--- a/test/util/promise.js
+++ b/test/util/promise.js
@@ -4,13 +4,13 @@ const expect = chai.expect
 chai.use(require('chai-as-promised'))
 chai.use(require('sinon-chai'))
 
-var P = require('../../src/util/promise.js')
+let P = require('../../src/util/promise.js')
 
 describe('util/promise', function () {
   describe('.anySeries()', function () {
     it('should resolve in series', function () {
-      var spy1 = sinon.spy()
-      var spy2 = sinon.spy()
+      let spy1 = sinon.spy()
+      let spy2 = sinon.spy()
       return P
         .anySeries(
           ['first', 'second'],
@@ -28,17 +28,17 @@ describe('util/promise', function () {
         .then(() => expect(spy2).to.have.been.calledAfter(spy1))
     })
     it('should reject when all rejected', function () {
-      var p = P.anySeries(['first', 'second', 'third'],
+      let p = P.anySeries(['first', 'second', 'third'],
         item => Promise.reject(new Error(item)))
       return expect(p).to.be.rejectedWith('third')
     })
     it('should resolve the value that first callback resolved', () => {
-      var p = P.anySeries(['first', 'second'],
+      let p = P.anySeries(['first', 'second'],
         item => Promise.resolve(item))
       return expect(p).to.eventually.equal('first')
     })
     it('should not call rest of callbacks once resolved', () => {
-      var spy = sinon.spy()
+      let spy = sinon.spy()
       return P
         .anySeries(['first', 'second'], (item, idx) => {
           if (idx > 0) {
@@ -51,18 +51,18 @@ describe('util/promise', function () {
   })
   describe('.mapSeries()', function () {
     it('should resolve when all resolved', function () {
-      var p = P.mapSeries(['first', 'second', 'third'],
+      let p = P.mapSeries(['first', 'second', 'third'],
         item => Promise.resolve(item))
       return expect(p).to.eventually.deep.equal(['first', 'second', 'third'])
     })
     it('should reject with the error that first callback rejected', () => {
-      var p = P.mapSeries(['first', 'second'],
+      let p = P.mapSeries(['first', 'second'],
         item => Promise.reject(item))
       return expect(p).to.rejectedWith('first')
     })
     it('should resolve in series', function () {
-      var spy1 = sinon.spy()
-      var spy2 = sinon.spy()
+      let spy1 = sinon.spy()
+      let spy2 = sinon.spy()
       return P
         .mapSeries(
           ['first', 'second'],
@@ -80,7 +80,7 @@ describe('util/promise', function () {
         .then(() => expect(spy2).to.have.been.calledAfter(spy1))
     })
     it('should not call rest of callbacks once rejected', () => {
-      var spy = sinon.spy()
+      let spy = sinon.spy()
       return P
         .mapSeries(['first', 'second'], (item, idx) => {
           if (idx > 0) {
diff --git a/test/util/strftime.js b/test/util/strftime.js
index 6f45f04f8..df9c287c6 100644
--- a/test/util/strftime.js
+++ b/test/util/strftime.js
@@ -1,11 +1,11 @@
 const chai = require('chai')
 const expect = chai.expect
 
-var t = require('../../src/util/strftime.js')
+let t = require('../../src/util/strftime.js')
 
 describe('util/strftime', function () {
-  var now
-  var then
+  let now
+  let then
   before(function () {
     mockUTC()
     now = new Date('2016-01-04T13:15:23.000Z')
@@ -37,7 +37,7 @@ describe('util/strftime', function () {
     expect(t(now, '%I')).to.equal('01')
   })
   it('should format %I as 12 for 00:00', function () {
-    var date = new Date('2016-01-01T00:00:00.000Z')
+    let date = new Date('2016-01-01T00:00:00.000Z')
     expect(t(date, '%I')).to.equal('12')
   })
   describe('%j', function () {
@@ -45,11 +45,11 @@ describe('util/strftime', function () {
       expect(t(then, '%j')).to.equal('066')
     })
     it('should take count of leap years', function () {
-      var date = new Date('2001-03-01')
+      let date = new Date('2001-03-01')
       expect(t(date, '%j')).to.equal('060')
     })
     it('should take count of leap years', function () {
-      var date = new Date('2000-03-01')
+      let date = new Date('2000-03-01')
       expect(t(date, '%j')).to.equal('061')
     })
   })
@@ -60,7 +60,7 @@ describe('util/strftime', function () {
     expect(t(now, '%l')).to.equal(' 1')
   })
   it('should format %l as 12 for 00:00', function () {
-    var date = new Date('2016-01-01T00:00:00.000Z')
+    let date = new Date('2016-01-01T00:00:00.000Z')
     expect(t(date, '%l')).to.equal('12')
   })
   it('should format %L as 0 padded millisecond', function () {
@@ -75,9 +75,9 @@ describe('util/strftime', function () {
     expect(t(then, '%P')).to.equal('am')
   })
   it('should format %q as date suffix', function () {
-    var st = new Date('2016-03-01T03:05:03.000Z')
-    var nd = new Date('2016-03-02T03:05:03.000Z')
-    var rd = new Date('2016-03-03T03:05:03.000Z')
+    let st = new Date('2016-03-01T03:05:03.000Z')
+    let nd = new Date('2016-03-02T03:05:03.000Z')
+    let rd = new Date('2016-03-03T03:05:03.000Z')
     expect(t(st, '%q')).to.equal('st')
     expect(t(nd, '%q')).to.equal('nd')
     expect(t(rd, '%q')).to.equal('rd')
@@ -113,7 +113,7 @@ describe('util/strftime', function () {
     expect(t(now, '%z')).to.equal('+0800')
   })
   it('should format %z as negative time zone', function () {
-    var date = new Date('2016-01-04T13:15:23.000Z')
+    let date = new Date('2016-01-04T13:15:23.000Z')
     date.getTimezoneOffset = () => 480
     expect(t(date, '%z')).to.equal('-0800')
   })
@@ -126,7 +126,7 @@ describe('util/strftime', function () {
 })
 
 function mockUTC () {
-  var p = Date.prototype
+  let p = Date.prototype
 
   p._getHours = p.getHours
   p.getHours = p.getUTCHours
@@ -139,7 +139,7 @@ function mockUTC () {
 }
 
 function restoreUTC () {
-  var p = Date.prototype
+  let p = Date.prototype
   p.getHours = p._getHours
   p.getDays = p._getDays
   p.getTimezoneOffset = p._getTimezoneOffset
diff --git a/test/util/underscore.js b/test/util/underscore.js
index ca365df2b..7b9c1bf7a 100644
--- a/test/util/underscore.js
+++ b/test/util/underscore.js
@@ -1,10 +1,10 @@
-const chai = require('chai')
-const sinon = require('sinon')
-const expect = chai.expect
-const Errors = require('../../src/util/error.js')
-chai.use(require('sinon-chai'))
+import chai from 'chai'
+import sinon from 'sinon'
+import Errors from '../../src/util/error.js'
+import _ from '../../src/util/underscore.js'
 
-var _ = require('../../src/util/underscore.js')
+const expect = chai.expect
+chai.use(require('sinon-chai'))
 
 describe('util/underscore', function () {
   describe('.isError()', function () {
@@ -12,7 +12,7 @@ describe('util/underscore', function () {
       expect(_.isError(new Error())).to.be.true
     })
     it('should return true for RenderError', function () {
-      var tpl = {
+      let tpl = {
         token: {
           input: 'xx'
         }
@@ -53,21 +53,21 @@ describe('util/underscore', function () {
   })
   describe('.forOwn()', function () {
     it('should iterate all properties', function () {
-      var spy = sinon.spy()
-      var obj = {
+      let spy = sinon.spy()
+      let obj = {
         foo: 'bar'
       }
       _.forOwn(obj, spy)
       expect(spy).to.have.been.calledWith('bar', 'foo', obj)
     })
     it('should default to empty object', function () {
-      var spy = sinon.spy()
+      let spy = sinon.spy()
       _.forOwn(undefined, spy)
       expect(spy).to.have.not.been.called
     })
     it('should not iterate over properties on prototype', function () {
-      var spy = sinon.spy()
-      var obj = Object.create({
+      let spy = sinon.spy()
+      let obj = Object.create({
         bar: 'foo'
       })
       obj.foo = 'bar'
@@ -76,7 +76,7 @@ describe('util/underscore', function () {
       expect(spy).to.have.been.calledWith('bar', 'foo', obj)
     })
     it('should break when returned false', function () {
-      var spy = sinon.stub().returns(false)
+      let spy = sinon.stub().returns(false)
       _.forOwn({
         'foo': 'foo',
         'bar': 'foo'
@@ -101,11 +101,11 @@ describe('util/underscore', function () {
       })
     })
     it('should assign 2 objects', function () {
-      var src = {
+      let src = {
         foo: 'foo',
         bar: 'bar'
       }
-      var dst = {
+      let dst = {
         foo: 'bar',
         kaa: 'kaa'
       }
diff --git a/test/util/url.js b/test/util/url.js
index bf3ac742e..ec6ded851 100644
--- a/test/util/url.js
+++ b/test/util/url.js
@@ -7,7 +7,7 @@ describe('util/url', function () {
     return
   }
   const JSDOM = require('jsdom').JSDOM
-  var dom
+  let dom
   beforeEach(function () {
     dom = new JSDOM(``, {
       url: 'https://example.com/foo/bar/',
diff --git a/test/xhr.js b/test/xhr.js
index 2dfb3730a..01e224966 100644
--- a/test/xhr.js
+++ b/test/xhr.js
@@ -1,6 +1,6 @@
-const Liquid = require('..')
-const sinon = require('sinon')
-const chai = require('chai')
+import Liquid from '..'
+import sinon from 'sinon'
+import chai from 'chai'
 const expect = chai.expect
 chai.use(require('chai-as-promised'))
 
@@ -9,7 +9,7 @@ describe('xhr', () => {
     return
   }
   const JSDOM = require('jsdom').JSDOM
-  var server, engine, dom
+  let server, engine, dom
   beforeEach(() => {
     server = sinon.createFakeServer()
     server.autoRespond = true