Merge pull request #2 from mobilusoss/issue-1

close #1
mobilusoss · Nov 11, 2019 · 207ed0e · 207ed0e
2 parents 719a961 + 8937694
commit 207ed0e
Show file tree

Hide file tree

Showing 12 changed files with 3,359 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "chalk": "^1.0.0",
-    "lodash": "^2.4.1"
+    "lodash": "^4.17.15"
   },
   "devDependencies": {
     "grunt": "^1.0.0",

diff --git a/tasks/jst.js b/tasks/jst.js
@@ -48,7 +48,7 @@ module.exports = function(grunt) {
         var compiled, filename;
 
         try {
-          compiled = _.template(src, false, options.templateSettings).source;
+          compiled = _.template(src, options.templateSettings).source;
         } catch (e) {
           grunt.log.error(e);
           grunt.fail.warn('JST ' + chalk.cyan(filepath) + ' failed to compile.');

diff --git a/test/expected/amd_wrapper.js b/test/expected/amd_wrapper.js
@@ -3,7 +3,7 @@ define(function(){
 this["JST"] = this["JST"] || {};
 
 this["JST"]["test/fixtures/template.html"] = function(obj) {
-var __t, __p = '', __e = _.escape;
+var __t, __p = '';
 __p += '<head><title>' +
 ((__t = ( obj.title )) == null ? '' : __t) +
 '</title></head>';

diff --git a/test/expected/amd_wrapper_no_ns.js b/test/expected/amd_wrapper_no_ns.js
@@ -1,7 +1,7 @@
 define(function(){
 
 return function(obj) {
-var __t, __p = '', __e = _.escape;
+var __t, __p = '';
 __p += '<head><title>' +
 ((__t = ( obj.title )) == null ? '' : __t) +
 '</title></head>';

diff --git a/test/expected/jst.js b/test/expected/jst.js
@@ -1,7 +1,7 @@
 this["JST"] = this["JST"] || {};
 
 this["JST"]["test/fixtures/template.html"] = function(obj) {
-var __t, __p = '', __e = _.escape;
+var __t, __p = '';
 __p += '<head><title>' +
 ((__t = ( obj.title )) == null ? '' : __t) +
 '</title></head>';

diff --git a/test/expected/local_scope.js b/test/expected/local_scope.js
@@ -2,7 +2,7 @@ this["JST"] = this["JST"] || {};
 
 this["JST"]["test/fixtures/template_local_scope.html"] = function(obj) {
 obj || (obj = {});
-var __t, __p = '', __e = _.escape;
+var __t, __p = '';
 with (obj) {
 __p += '<head><title>' +
 ((__t = ( title )) == null ? '' : __t) +

diff --git a/test/expected/ns_nested.js b/test/expected/ns_nested.js
@@ -3,7 +3,7 @@ this["MyApp"]["JST"] = this["MyApp"]["JST"] || {};
 this["MyApp"]["JST"]["Main"] = this["MyApp"]["JST"]["Main"] || {};
 
 this["MyApp"]["JST"]["Main"]["test/fixtures/template.html"] = function(obj) {
-var __t, __p = '', __e = _.escape;
+var __t, __p = '';
 __p += '<head><title>' +
 ((__t = ( obj.title )) == null ? '' : __t) +
 '</title></head>';

diff --git a/test/expected/pretty.js b/test/expected/pretty.js
@@ -1,3 +1,3 @@
 this["JST"] = this["JST"] || {};
 
-this["JST"]["test/fixtures/template.html"] = function(obj) {var __t, __p = '', __e = _.escape;__p += '<head><title>' +((__t = ( obj.title )) == null ? '' : __t) +'</title></head>';return __p};
+this["JST"]["test/fixtures/template.html"] = function(obj) {var __t, __p = '';__p += '<head><title>' +((__t = ( obj.title )) == null ? '' : __t) +'</title></head>';return __p};
diff --git a/test/expected/pretty_amd.js b/test/expected/pretty_amd.js
@@ -2,7 +2,7 @@ define(function(){
 
   this["JST"] = this["JST"] || {};
 
-  this["JST"]["test/fixtures/template.html"] = function(obj) {var __t, __p = '', __e = _.escape;__p += '<head><title>' +((__t = ( obj.title )) == null ? '' : __t) +'</title></head>';return __p};
+  this["JST"]["test/fixtures/template.html"] = function(obj) {var __t, __p = '';__p += '<head><title>' +((__t = ( obj.title )) == null ? '' : __t) +'</title></head>';return __p};
 
   return this["JST"];
 

diff --git a/test/expected/process_content.js b/test/expected/process_content.js
@@ -1,7 +1,7 @@
 this["JST"] = this["JST"] || {};
 
 this["JST"]["test/fixtures/indent_template.html"] = function(obj) {
-var __t, __p = '', __e = _.escape;
+var __t, __p = '';
 __p += '<div>\n<div>\n<div>\n' +
 ((__t = ( obj.name )) == null ? '' : __t) +
 '\n</div>\n</div>\n</div>';

diff --git a/test/expected/uglyfile.js b/test/expected/uglyfile.js
@@ -1,7 +1,7 @@
 this["JST"] = this["JST"] || {};
 
 this["JST"]["test/fixtures/it's-a-bad-filename.html"] = function(obj) {
-var __t, __p = '', __e = _.escape;
+var __t, __p = '';
 __p += 'never name your file like this.';
 return __p
 };