refactor: es6 building and linting

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
 }
 

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))

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
   }
 }

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

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)
 }