Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Update a couple of dependencies in package.json at the root #12059

Merged
merged 1 commit into from
May 21, 2016
Merged

Update a couple of dependencies in package.json at the root #12059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ module.exports = function (grunt) {
'use strict';

// load dependencies
require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin', 'grunt-cleanempty', 'grunt-eslint']});
require('load-grunt-tasks')(grunt, {
pattern: [
'grunt-*',
'!grunt-cli',
'!grunt-lib-phantomjs',
'!grunt-template-jasmine-requirejs'
]
});
grunt.loadTasks('tasks');

// Project configuration.
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"grunt-cli": "0.1.9",
"phantomjs": "1.9.18",
"grunt-lib-phantomjs": "0.3.0",
"grunt-eslint": "17.1.0",
"grunt-eslint": "18.1.0",
"grunt-contrib-watch": "0.4.3",
"grunt-contrib-jasmine": "0.4.2",
"grunt-template-jasmine-requirejs": "0.1.0",
Expand All @@ -33,8 +33,8 @@
"grunt-contrib-concat": "0.3.0",
"grunt-targethtml": "0.2.6",
"grunt-usemin": "0.1.11",
"load-grunt-tasks": "0.2.0",
"q": "0.9.2",
"load-grunt-tasks": "3.5.0",
"q": "1.4.1",
"semver": "^4.1.0",
"xmldoc": "^0.1.2",
"grunt-cleanempty": "1.0.3"
Expand Down
6 changes: 3 additions & 3 deletions src/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"grunt-cli": "0.1.9",
"phantomjs": "1.9.18",
"grunt-lib-phantomjs": "0.3.0",
"grunt-eslint": "17.1.0",
"grunt-eslint": "18.1.0",
"grunt-contrib-watch": "0.4.3",
"grunt-contrib-jasmine": "0.4.2",
"grunt-template-jasmine-requirejs": "0.1.0",
Expand All @@ -56,8 +56,8 @@
"grunt-contrib-concat": "0.3.0",
"grunt-targethtml": "0.2.6",
"grunt-usemin": "0.1.11",
"load-grunt-tasks": "0.2.0",
"q": "0.9.2",
"load-grunt-tasks": "3.5.0",
"q": "1.4.1",
"semver": "^4.1.0",
"xmldoc": "^0.1.2",
"grunt-cleanempty": "1.0.3"
Expand Down
3 changes: 1 addition & 2 deletions src/extensions/default/JavaScriptCodeHints/HintUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ define(function (require, exports, module) {
case "number":
case "regexp":
case "string":
// exclude variable & param decls
case "def":
case "def": // exclude variable & param decls
return false;
case "string-2":
// exclude strings inside a regexp
Expand Down