Skip to content

Commit

Permalink
Merge pull request #750 from twigjs/release
Browse files Browse the repository at this point in the history
v1.15.2
  • Loading branch information
RobLoach authored Aug 17, 2020
2 parents 171241a + ec63d29 commit 24327b4
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Version 1.15.2, released 2020-08-19
-----------------------------------
Minor improvements:
* Specify MimeType to always use for AJAX templates ([#742](https://github.com/twigjs/twig.js/pull/742)) by [MasterOdin](https://github.com/MasterOdin)
* Added token count validation ([#745](https://github.com/twigjs/twig.js/pull/742)) by [HakS](https://github.com/haks)
* Async renderFile error callback ([#748](https://github.com/twigjs/twig.js/pull/748)) by [ArnauMrJeff](https://github.com/ArnauMrJeff)
* Ternary operator overrides context fix ([#737](https://github.com/twigjs/twig.js/issues/737)) by [oleg-andreyev](https://github.com/oleg-andreyev)
* Update lodash to `4.17.19`
* Update elliptic to `6.5.3`

Version 1.15.1, released 2020-04-16
-----------------------------------
Major improvements:
Expand Down
7 changes: 6 additions & 1 deletion lib/compile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,17 @@ exports.compile = function (options, files) {

files.forEach(file => {
FS.stat(file, (err, stats) => {
if (err) {
console.error('ERROR ' + file + ': Unable to stat file');
return;
}

if (stats.isDirectory()) {
parseTemplateFolder(file, options.pattern);
} else if (stats.isFile()) {
parseTemplateFile(file);
} else {
console.log('ERROR ' + file + ': Unable to stat file');
console.log('ERROR ' + file + ': Unknown file information');
}
});
});
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "John Roepke <[email protected]> (http://john.sh/)",
"name": "twig",
"description": "JS port of the Twig templating language.",
"version": "1.15.1",
"version": "1.15.2",
"homepage": "https://github.com/twigjs/twig.js",
"license": "BSD-2-Clause",
"licenses": [
Expand Down

0 comments on commit 24327b4

Please sign in to comment.