Skip to content

Commit 24327b4

Browse files
authored
Merge pull request #750 from twigjs/release
v1.15.2
2 parents 171241a + ec63d29 commit 24327b4

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 1.15.2, released 2020-08-19
2+
-----------------------------------
3+
Minor improvements:
4+
* Specify MimeType to always use for AJAX templates ([#742](https://github.com/twigjs/twig.js/pull/742)) by [MasterOdin](https://github.com/MasterOdin)
5+
* Added token count validation ([#745](https://github.com/twigjs/twig.js/pull/742)) by [HakS](https://github.com/haks)
6+
* Async renderFile error callback ([#748](https://github.com/twigjs/twig.js/pull/748)) by [ArnauMrJeff](https://github.com/ArnauMrJeff)
7+
* Ternary operator overrides context fix ([#737](https://github.com/twigjs/twig.js/issues/737)) by [oleg-andreyev](https://github.com/oleg-andreyev)
8+
* Update lodash to `4.17.19`
9+
* Update elliptic to `6.5.3`
10+
111
Version 1.15.1, released 2020-04-16
212
-----------------------------------
313
Major improvements:

lib/compile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,17 @@ exports.compile = function (options, files) {
2020

2121
files.forEach(file => {
2222
FS.stat(file, (err, stats) => {
23+
if (err) {
24+
console.error('ERROR ' + file + ': Unable to stat file');
25+
return;
26+
}
27+
2328
if (stats.isDirectory()) {
2429
parseTemplateFolder(file, options.pattern);
2530
} else if (stats.isFile()) {
2631
parseTemplateFile(file);
2732
} else {
28-
console.log('ERROR ' + file + ': Unable to stat file');
33+
console.log('ERROR ' + file + ': Unknown file information');
2934
}
3035
});
3136
});

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "John Roepke <john@justjohn.us> (http://john.sh/)",
33
"name": "twig",
44
"description": "JS port of the Twig templating language.",
5-
"version": "1.15.1",
5+
"version": "1.15.2",
66
"homepage": "https://github.com/twigjs/twig.js",
77
"license": "BSD-2-Clause",
88
"licenses": [

0 commit comments

Comments
 (0)