Skip to content

Update to latest version of eco #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cesine merged 6 commits into from
Sep 4, 2020
Merged

Update to latest version of eco #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
998569b
Merge pull request #2 from cesine/travis
cesine Jul 21, 2020
f533681
try using lastest eco 1.1.0-rc-3
cesine Jul 21, 2020
feab960
compile returns a function not identifier =
cesine Jul 22, 2020
7786d0c
update fixtures
cesine Jul 22, 2020
676cdd9
reduce diff
cesine Jul 22, 2020
28b7489
add node 10 in travis
cesine Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ node_js:
- '0.12'
- 6
- 8
- 10
- 12

script:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"node": ">=0.8"
},
"dependencies": {
"eco": "1.0.3"
"eco": "1.1.0-rc-3"
},
"devDependencies": {
"grunt": "1.0.4",
Expand Down
3 changes: 2 additions & 1 deletion tasks/eco.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ module.exports = function(grunt) {
}

try {
output = eco.compile(grunt.file.read(src)).replace(/module\.exports/, '');
output = ' = ' + eco.compile(grunt.file.read(src));
grunt.log.debug('output', output);
} catch (e) {
grunt.log.error("Error in " + src + ":\n" + e);
grunt.fail.warn("Eco failed to compile " + src + ".");
Expand Down
94 changes: 50 additions & 44 deletions tests/expected/amdTest/advanced-example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,70 @@
define(function(){
var template = function(__obj) {
var _safe = function(value) {
if (typeof value === 'undefined' && value == null)
value = '';
var result = new String(value);
result.ecoSafe = true;
return result;
if (!__obj) __obj = {};
var __out = [], __capture = function(callback) {
var out = __out, result;
__out = [];
callback.call(this);
result = __out.join('');
__out = out;
return __safe(result);
}, __sanitize = function(value) {
if (value && value.ecoSafe) {
return value;
} else if (typeof value !== 'undefined' && value != null) {
return __escape(value);
} else {
return '';
}
}, __safe, __objSafe = __obj.safe, __escape = __obj.escape;
__safe = __obj.safe = function(value) {
if (value && value.ecoSafe) {
return value;
} else {
if (!(typeof value !== 'undefined' && value != null)) value = '';
var result = new String(value);
result.ecoSafe = true;
return result;
}
};
return (function() {
var __out = [], __self = this, _print = function(value) {
if (typeof value !== 'undefined' && value != null)
__out.push(value.ecoSafe ? value : __self.escape(value));
}, _capture = function(callback) {
var out = __out, result;
__out = [];
callback.call(this);
result = __out.join('');
__out = out;
return _safe(result);
if (!__escape) {
__escape = __obj.escape = function(value) {
return ('' + value)
.replace(/&/g, '&')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
};
}
(function() {
(function() {
var i, len, project, ref;

if (this.projects.length) {
_print(_safe('\n '));
__out.push('\n ');
ref = this.projects;
for (i = 0, len = ref.length; i < len; i++) {
project = ref[i];
_print(_safe('\n <a href="'));
_print(project.url);
_print(_safe('">'));
_print(project.name);
_print(_safe('</a>\n <p>'));
_print(project.description);
_print(_safe('</p>\n '));
__out.push('\n <a href="');
__out.push(__sanitize(project.url));
__out.push('">');
__out.push(__sanitize(project.name));
__out.push('</a>\n <p>');
__out.push(__sanitize(project.description));
__out.push('</p>\n ');
}
_print(_safe('\n'));
__out.push('\n');
} else {
_print(_safe('\n No projects\n'));
__out.push('\n No projects\n');
}

_print(_safe('\n'));
__out.push('\n');

}).call(this);

return __out.join('');
}).call((function() {
var obj = {
escape: function(value) {
return ('' + value)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
},
safe: _safe
}, key;
for (key in __obj) obj[key] = __obj[key];
return obj;
})());
};
}).call(__obj);
__obj.safe = __objSafe, __obj.escape = __escape;
return __out.join('');
}
return template;
});
76 changes: 41 additions & 35 deletions tests/expected/amdTest/example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,52 @@
define(function(){
var template = function(__obj) {
var _safe = function(value) {
if (typeof value === 'undefined' && value == null)
value = '';
var result = new String(value);
result.ecoSafe = true;
return result;
if (!__obj) __obj = {};
var __out = [], __capture = function(callback) {
var out = __out, result;
__out = [];
callback.call(this);
result = __out.join('');
__out = out;
return __safe(result);
}, __sanitize = function(value) {
if (value && value.ecoSafe) {
return value;
} else if (typeof value !== 'undefined' && value != null) {
return __escape(value);
} else {
return '';
}
}, __safe, __objSafe = __obj.safe, __escape = __obj.escape;
__safe = __obj.safe = function(value) {
if (value && value.ecoSafe) {
return value;
} else {
if (!(typeof value !== 'undefined' && value != null)) value = '';
var result = new String(value);
result.ecoSafe = true;
return result;
}
};
return (function() {
var __out = [], __self = this, _print = function(value) {
if (typeof value !== 'undefined' && value != null)
__out.push(value.ecoSafe ? value : __self.escape(value));
}, _capture = function(callback) {
var out = __out, result;
__out = [];
callback.call(this);
result = __out.join('');
__out = out;
return _safe(result);
if (!__escape) {
__escape = __obj.escape = function(value) {
return ('' + value)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
};
}
(function() {
(function() {
_print(this.project.description);
__out.push(__sanitize(this.project.description));

_print(_safe('\n'));
__out.push('\n');

}).call(this);

return __out.join('');
}).call((function() {
var obj = {
escape: function(value) {
return ('' + value)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
},
safe: _safe
}, key;
for (key in __obj) obj[key] = __obj[key];
return obj;
})());
};
}).call(__obj);
__obj.safe = __objSafe, __obj.escape = __escape;
return __out.join('');
}
return template;
});
76 changes: 41 additions & 35 deletions tests/expected/amdTest/nested-example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,52 @@
define(function(){
var template = function(__obj) {
var _safe = function(value) {
if (typeof value === 'undefined' && value == null)
value = '';
var result = new String(value);
result.ecoSafe = true;
return result;
if (!__obj) __obj = {};
var __out = [], __capture = function(callback) {
var out = __out, result;
__out = [];
callback.call(this);
result = __out.join('');
__out = out;
return __safe(result);
}, __sanitize = function(value) {
if (value && value.ecoSafe) {
return value;
} else if (typeof value !== 'undefined' && value != null) {
return __escape(value);
} else {
return '';
}
}, __safe, __objSafe = __obj.safe, __escape = __obj.escape;
__safe = __obj.safe = function(value) {
if (value && value.ecoSafe) {
return value;
} else {
if (!(typeof value !== 'undefined' && value != null)) value = '';
var result = new String(value);
result.ecoSafe = true;
return result;
}
};
return (function() {
var __out = [], __self = this, _print = function(value) {
if (typeof value !== 'undefined' && value != null)
__out.push(value.ecoSafe ? value : __self.escape(value));
}, _capture = function(callback) {
var out = __out, result;
__out = [];
callback.call(this);
result = __out.join('');
__out = out;
return _safe(result);
if (!__escape) {
__escape = __obj.escape = function(value) {
return ('' + value)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
};
}
(function() {
(function() {
_print(this.project.description);
__out.push(__sanitize(this.project.description));

_print(_safe('\n'));
__out.push('\n');

}).call(this);

return __out.join('');
}).call((function() {
var obj = {
escape: function(value) {
return ('' + value)
.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/"/g, '&quot;');
},
safe: _safe
}, key;
for (key in __obj) obj[key] = __obj[key];
return obj;
})());
};
}).call(__obj);
__obj.safe = __objSafe, __obj.escape = __escape;
return __out.join('');
}
return template;
});
Loading