Skip to content
This repository was archived by the owner on May 16, 2024. It is now read-only.

Commit c6d4e12

Browse files
committed
add asserts for tests, update uglify-js, fixes bazilio91#10
1 parent 53532b6 commit c6d4e12

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

index.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var ejs = require('ejs'),
2-
uglify = require('uglify-js'),
2+
UglifyJS = require('uglify-js'),
33
utils = require('loader-utils'),
44
path = require('path');
55

@@ -22,8 +22,9 @@ module.exports = function (source) {
2222

2323
// Beautify javascript code
2424
if (!this.minimize && opts.beautify !== false) {
25-
var ast = uglify.parser.parse(template.toString());
26-
template = uglify.uglify.gen_code(ast, {beautify: true});
25+
var ast = UglifyJS.parse(template.toString());
26+
ast.figure_out_scope();
27+
template = ast.print_to_string({beautify: true});
2728
}
2829

2930
return 'module.exports = ' + template;

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"dependencies": {
2626
"ejs": "^2.0.0",
2727
"loader-utils": "^0.2.7",
28-
"uglify-js": "~1.3.4"
28+
"uglify-js": "~2.6.1"
2929
},
3030
"devDependencies": {
3131
"node-libs-browser": "^0.5.0",

test/app.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
const assert = require('assert');
2+
13
var tpl = require("./template.ejs");
2-
console.log(tpl({noun: "World"}));
4+
assert.equal(tpl({noun: "World"}), 'Hello, World!');
35

46
var tpl2 = require("!!../?delimiter=?!./template2.ejs");
5-
console.log( tpl2({hobbies: ["food", "code"]}).trimRight() );
7+
assert.equal(tpl2({hobbies: ["food", "code"]}).trimRight(), " I like food.\n I like code.");
68

79
var tpl3 = require("./subdir/parent.ejs");
8-
console.log(tpl3({foo: "foo"}));
10+
assert.equal(tpl3({foo: "foo"}), "parent: child: foo\n\n");

0 commit comments

Comments
 (0)