Skip to content

Bumping #1464

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
nknapp merged 3 commits into from
Sep 4, 2018
Merged

Bumping #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1d864d
chore: bump various dependencies
nknapp Sep 3, 2018
8359722
style: omit linting error caused by removing "if"
nknapp Sep 3, 2018
2145c14
bump grunt-plugin-dependencies to 1.x versions
nknapp Sep 3, 2018
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
3 changes: 3 additions & 0 deletions lib/handlebars/compiler/compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ Compiler.prototype = {
'lookup': true
};
if (knownHelpers) {
// the next line should use "Object.keys", but the code has been like this a long time and changing it, might
// cause backwards-compatibility issues... It's an old library...
// eslint-disable-next-line guard-for-in
for (let name in knownHelpers) {
this.options.knownHelpers[name] = knownHelpers[name];
}
Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@
"benchmark": "~1.0",
"dustjs-linkedin": "^2.0.2",
"eco": "~1.1.0-rc-3",
"grunt": "~0.4.1",
"grunt": "^1.0.3",
"grunt-babel": "^5.0.0",
"grunt-cli": "~0.1.10",
"grunt-contrib-clean": "0.x",
"grunt-contrib-concat": "0.x",
"grunt-contrib-connect": "0.x",
"grunt-contrib-copy": "0.x",
"grunt-contrib-requirejs": "0.x",
"grunt-contrib-uglify": "0.x",
"grunt-contrib-watch": "0.x",
"grunt-cli": "^1",
"grunt-contrib-clean": "^1",
"grunt-contrib-concat": "^1",
"grunt-contrib-connect": "^1",
"grunt-contrib-copy": "^1",
"grunt-contrib-requirejs": "^1",
"grunt-contrib-uglify": "^1",
"grunt-contrib-watch": "^1.1.0",
"grunt-eslint": "^20.1.0",
"grunt-saucelabs": "8.x",
"grunt-webpack": "^1.0.8",
"istanbul": "^0.3.0",
"jison": "~0.3.0",
"mocha": "~1.20.0",
"mocha": "^5",
"mock-stdin": "^0.3.0",
"mustache": "^2.1.3",
"semver": "^5.0.1",
Expand Down
11 changes: 9 additions & 2 deletions spec/builtins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,14 @@ describe('builtin helpers', function() {
console.info = function(info) {
equals('whee', info);
called = true;
console.info = $info;
console.log = $log;
};
console.log = function(log) {
equals('whee', log);
called = true;
console.info = $info;
console.log = $log;
};

shouldCompileTo(string, hash, '');
Expand All @@ -329,6 +333,7 @@ describe('builtin helpers', function() {
console.error = function(log) {
equals('whee', log);
called = true;
console.error = $error;
};

shouldCompileTo(string, [hash,,,, {level: '03'}], '');
Expand All @@ -343,6 +348,7 @@ describe('builtin helpers', function() {
console.log = function(log) {
equals('whee', log);
called = true;
console.log = $log;
};

shouldCompileTo(string, [hash,,,, {level: '03'}], '');
Expand Down Expand Up @@ -385,9 +391,9 @@ describe('builtin helpers', function() {
var hash = { blah: 'whee' };
var called = false;

console.info = console.log = console.error = console.debug = function(log) {
equals('whee', log);
console.info = console.log = console.error = console.debug = function() {
called = true;
console.info = console.log = console.error = console.debug = $log;
};

shouldCompileTo(string, hash, '');
Expand All @@ -403,6 +409,7 @@ describe('builtin helpers', function() {
equals('foo', log2);
equals(1, log3);
called = true;
console.log = $log;
};

shouldCompileTo(string, hash, '');
Expand Down
2 changes: 2 additions & 0 deletions spec/env/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
var global = (function() { return this; }());

var AssertError;
if (Error.captureStackTrace) {
AssertError = function AssertError(message, caller) {
Expand Down