diff --git a/.npmignore b/.npmignore index 65e3ba2ed..9f46a954f 100644 --- a/.npmignore +++ b/.npmignore @@ -1 +1,4 @@ -test/ +/coverage +/src +/test +.* diff --git a/package.json b/package.json index 41e18fa5b..2170371c4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "liquidjs", "version": "5.2.0", "description": "Liquid template engine by pure JavaScript: compatible to shopify, easy to extend.", - "main": "index.js", + "main": "src/index.js", "scripts": { "lint": "eslint .", "test": "mocha --recursive", diff --git a/filters.js b/src/filters.js similarity index 96% rename from filters.js rename to src/filters.js index 3842255e1..2bac7a072 100644 --- a/filters.js +++ b/src/filters.js @@ -1,7 +1,7 @@ 'use strict' -const strftime = require('./src/util/strftime.js') -const _ = require('./src/util/underscore.js') -const isTruthy = require('./src/syntax.js').isTruthy +const strftime = require('./util/strftime.js') +const _ = require('./util/underscore.js') +const isTruthy = require('./syntax.js').isTruthy let escapeMap = { '&': '&', diff --git a/index.js b/src/index.js similarity index 87% rename from index.js rename to src/index.js index 13ee3276f..d3abd948f 100644 --- a/index.js +++ b/src/index.js @@ -1,21 +1,21 @@ -const Scope = require('./src/scope') -const _ = require('./src/util/underscore.js') -const assert = require('./src/util/assert.js') -const tokenizer = require('./src/tokenizer.js') -const statFileAsync = require('./src/util/fs.js').statFileAsync -const readFileAsync = require('./src/util/fs.js').readFileAsync +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('./src/util/url.js') -const Render = require('./src/render.js') -const lexical = require('./src/lexical.js') -const Tag = require('./src/tag.js') -const Filter = require('./src/filter.js') -const Parser = require('./src/parser') -const Syntax = require('./src/syntax.js') +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('./src/util/promise.js').anySeries -const Errors = require('./src/util/error.js') +const anySeries = require('./util/promise.js').anySeries +const Errors = require('./util/error.js') var _engine = { init: function (tag, filter, options) { diff --git a/tags/assign.js b/src/tags/assign.js similarity index 86% rename from tags/assign.js rename to src/tags/assign.js index 502490adb..9f67d39e6 100644 --- a/tags/assign.js +++ b/src/tags/assign.js @@ -2,8 +2,8 @@ const Liquid = require('..') const lexical = Liquid.lexical const re = new RegExp(`(${lexical.identifier.source})\\s*=(.*)`) -const assert = require('../src/util/assert.js') -const types = require('../src/scope').types +const assert = require('../util/assert.js') +const types = require('../scope').types module.exports = function (liquid) { liquid.registerTag('assign', { diff --git a/tags/capture.js b/src/tags/capture.js similarity index 91% rename from tags/capture.js rename to src/tags/capture.js index 6242252d8..089a745e7 100644 --- a/tags/capture.js +++ b/src/tags/capture.js @@ -2,8 +2,8 @@ const Liquid = require('..') const lexical = Liquid.lexical const re = new RegExp(`(${lexical.identifier.source})`) -const assert = require('../src/util/assert.js') -const types = require('../src/scope.js').types +const assert = require('../util/assert.js') +const types = require('../scope.js').types module.exports = function (liquid) { liquid.registerTag('capture', { diff --git a/tags/case.js b/src/tags/case.js similarity index 100% rename from tags/case.js rename to src/tags/case.js diff --git a/tags/comment.js b/src/tags/comment.js similarity index 100% rename from tags/comment.js rename to src/tags/comment.js diff --git a/tags/cycle.js b/src/tags/cycle.js similarity index 96% rename from tags/cycle.js rename to src/tags/cycle.js index 96cb4075e..aeb711230 100644 --- a/tags/cycle.js +++ b/src/tags/cycle.js @@ -2,7 +2,7 @@ const Liquid = require('..') const lexical = Liquid.lexical const groupRE = new RegExp(`^(?:(${lexical.value.source})\\s*:\\s*)?(.*)$`) const candidatesRE = new RegExp(lexical.value.source, 'g') -const assert = require('../src/util/assert.js') +const assert = require('../util/assert.js') module.exports = function (liquid) { liquid.registerTag('cycle', { diff --git a/tags/decrement.js b/src/tags/decrement.js similarity index 90% rename from tags/decrement.js rename to src/tags/decrement.js index 8fc968135..7aa1df0d8 100644 --- a/tags/decrement.js +++ b/src/tags/decrement.js @@ -1,8 +1,8 @@ 'use strict' const Liquid = require('..') const lexical = Liquid.lexical -const assert = require('../src/util/assert.js') -const types = require('../src/scope').types +const assert = require('../util/assert.js') +const types = require('../scope').types module.exports = function (liquid) { liquid.registerTag('decrement', { diff --git a/tags/for.js b/src/tags/for.js similarity index 94% rename from tags/for.js rename to src/tags/for.js index db84ec3ee..775318ba7 100644 --- a/tags/for.js +++ b/src/tags/for.js @@ -1,9 +1,9 @@ const Liquid = require('..') const lexical = Liquid.lexical -const mapSeries = require('../src/util/promise.js').mapSeries -const _ = require('../src/util/underscore.js') +const mapSeries = require('../util/promise.js').mapSeries +const _ = require('../util/underscore.js') const RenderBreakError = Liquid.Types.RenderBreakError -const assert = require('../src/util/assert.js') +const assert = require('../util/assert.js') const re = new RegExp(`^(${lexical.identifier.source})\\s+in\\s+` + `(${lexical.value.source})` + `(?:\\s+${lexical.hash.source})*` + diff --git a/tags/if.js b/src/tags/if.js similarity index 100% rename from tags/if.js rename to src/tags/if.js diff --git a/tags/include.js b/src/tags/include.js similarity index 97% rename from tags/include.js rename to src/tags/include.js index d765abe66..14ce725ab 100644 --- a/tags/include.js +++ b/src/tags/include.js @@ -3,7 +3,7 @@ const Liquid = require('..') const lexical = Liquid.lexical const withRE = new RegExp(`with\\s+(${lexical.value.source})`) const staticFileRE = /[^\s,]+/ -const assert = require('../src/util/assert.js') +const assert = require('../util/assert.js') module.exports = function (liquid) { liquid.registerTag('include', { diff --git a/tags/increment.js b/src/tags/increment.js similarity index 90% rename from tags/increment.js rename to src/tags/increment.js index f72e9057d..bc881635b 100644 --- a/tags/increment.js +++ b/src/tags/increment.js @@ -1,8 +1,8 @@ 'use strict' const Liquid = require('..') -const assert = require('../src/util/assert.js') +const assert = require('../util/assert.js') const lexical = Liquid.lexical -const types = require('../src/scope').types +const types = require('../scope').types module.exports = function (liquid) { liquid.registerTag('increment', { diff --git a/tags/index.js b/src/tags/index.js similarity index 100% rename from tags/index.js rename to src/tags/index.js diff --git a/tags/layout.js b/src/tags/layout.js similarity index 98% rename from tags/layout.js rename to src/tags/layout.js index f8df29e77..100b11906 100644 --- a/tags/layout.js +++ b/src/tags/layout.js @@ -1,6 +1,6 @@ const Liquid = require('..') const lexical = Liquid.lexical -const assert = require('../src/util/assert.js') +const assert = require('../util/assert.js') const staticFileRE = /\S+/ /* diff --git a/tags/raw.js b/src/tags/raw.js similarity index 100% rename from tags/raw.js rename to src/tags/raw.js diff --git a/tags/tablerow.js b/src/tags/tablerow.js similarity index 95% rename from tags/tablerow.js rename to src/tags/tablerow.js index 7386fe824..afab57009 100644 --- a/tags/tablerow.js +++ b/src/tags/tablerow.js @@ -1,7 +1,7 @@ const Liquid = require('..') -const mapSeries = require('../src/util/promise.js').mapSeries +const mapSeries = require('../util/promise.js').mapSeries const lexical = Liquid.lexical -const assert = require('../src/util/assert.js') +const assert = require('../util/assert.js') const re = new RegExp(`^(${lexical.identifier.source})\\s+in\\s+` + `(${lexical.value.source})` + `(?:\\s+${lexical.hash.source})*$`) diff --git a/tags/unless.js b/src/tags/unless.js similarity index 100% rename from tags/unless.js rename to src/tags/unless.js diff --git a/test/express.js b/test/express.js index 81693c6f7..a176a35e9 100644 --- a/test/express.js +++ b/test/express.js @@ -3,7 +3,7 @@ const expect = chai.expect const mock = require('mock-fs') const request = require('supertest') const express = require('express') -const Liquid = require('..') +const Liquid = require('../src') describe('engine#express()', function () { var app, engine diff --git a/test/filters.js b/test/filters.js index becfd33b3..e88969011 100644 --- a/test/filters.js +++ b/test/filters.js @@ -1,7 +1,7 @@ const chai = require('chai') const chaiAsPromised = require('chai-as-promised') const expect = chai.expect -var liquid = require('..')() +var liquid = require('../src')() chai.use(chaiAsPromised) var ctx = { diff --git a/test/liquid.js b/test/index.js similarity index 99% rename from test/liquid.js rename to test/index.js index b75dc500a..6a1e533e0 100644 --- a/test/liquid.js +++ b/test/index.js @@ -1,6 +1,6 @@ const chai = require('chai') const expect = chai.expect -const Liquid = require('..') +const Liquid = require('../src') const mock = require('mock-fs') chai.use(require('chai-as-promised')) diff --git a/test/options/cache.js b/test/options/cache.js index 9e0f4d370..fbdb69a1a 100644 --- a/test/options/cache.js +++ b/test/options/cache.js @@ -1,7 +1,7 @@ const chai = require('chai') const expect = chai.expect const mock = require('mock-fs') -const Liquid = require('../..') +const Liquid = require('../../src') chai.use(require('chai-as-promised')) describe('cache options', function () { diff --git a/test/options/strict.js b/test/options/strict.js index 30bdb8d3a..a686feaff 100644 --- a/test/options/strict.js +++ b/test/options/strict.js @@ -1,6 +1,6 @@ const chai = require('chai') const expect = chai.expect -const Liquid = require('../..') +const Liquid = require('../../src') chai.use(require('chai-as-promised')) describe('strict options', function () { diff --git a/test/options/trimming.js b/test/options/trimming.js index 35a4656eb..cccf5f74b 100644 --- a/test/options/trimming.js +++ b/test/options/trimming.js @@ -1,6 +1,6 @@ const chai = require('chai') const expect = chai.expect -const Liquid = require('../..') +const Liquid = require('../../src') chai.use(require('chai-as-promised')) describe('trimming', function () { diff --git a/test/tags/assign.js b/test/tags/assign.js index 6a8e243cc..a2604b833 100644 --- a/test/tags/assign.js +++ b/test/tags/assign.js @@ -1,5 +1,5 @@ 'use strict' -const Liquid = require('../..') +const Liquid = require('../../src') const chai = require('chai') const expect = chai.expect chai.use(require('chai-as-promised'))