diff --git a/package.json b/package.json index b295d0b..0cfe7f4 100644 --- a/package.json +++ b/package.json @@ -41,12 +41,15 @@ ], "license": "BSD", "devDependencies": { - "grunt-contrib-jshint": "~0.6.4", - "grunt-contrib-watch": "~0.1.4", - "grunt": "~0.4.1", - "grunt-contrib-jasmine": "~0.6", - "grunt-contrib-connect": "~0.2.0", - "grunt-bump": "0.0.13", + "grunt-contrib-jshint": "~2.0.0", + "grunt-contrib-watch": "~1.1.0", + "grunt": "~1.0.3", + "grunt-contrib-jasmine": "1.0.3", + "grunt-contrib-connect": "~2.0.0", + "grunt-bump": "0.8.0", "grunt-npm": "0.0.2" + }, + "dependencies": { + "lodash": "~4.17.11" } } diff --git a/src/template-jasmine-requirejs.js b/src/template-jasmine-requirejs.js index 3b72f46..ee349dd 100644 --- a/src/template-jasmine-requirejs.js +++ b/src/template-jasmine-requirejs.js @@ -1,5 +1,6 @@ "use strict"; +var _ = require('lodash'); var template = __dirname + '/templates/jasmine-requirejs.html', requirejs = { '2.0.0' : __dirname + '/../vendor/require-2.0.0.js', @@ -78,21 +79,21 @@ exports.process = function(grunt, task, context) { // Extract config from main require config file if (context.options.requireConfigFile) { // Remove mainConfigFile from src files - var requireConfigFiles = grunt.util._.flatten([context.options.requireConfigFile]); + var requireConfigFiles = _.flatten([context.options.requireConfigFile]); - var normalizedPaths = grunt.util._.map(requireConfigFiles, function(configFile){ + var normalizedPaths = _.map(requireConfigFiles, function(configFile){ return path.normalize(configFile); }); - context.scripts.src = grunt.util._.reject(context.scripts.src, function (script) { - return grunt.util._.contains(normalizedPaths, path.normalize(script)); + context.scripts.src = _.reject(context.scripts.src, function (script) { + return _.includes(normalizedPaths, path.normalize(script)); }); var configFromFiles = {}; - grunt.util._.map(requireConfigFiles, function (configFile) { - grunt.util._.merge(configFromFiles, parse.findConfig(grunt.file.read(configFile)).config); + _.map(requireConfigFiles, function (configFile) { + _.merge(configFromFiles, parse.findConfig(grunt.file.read(configFile)).config); }); - context.options.requireConfig = grunt.util._.merge(configFromFiles, context.options.requireConfig); + context.options.requireConfig = _.merge(configFromFiles, context.options.requireConfig); } @@ -119,7 +120,7 @@ exports.process = function(grunt, task, context) { } // Remove baseUrl and .js from src files - context.scripts.src = grunt.util._.map(context.scripts.src, getRelativeModuleUrl); + context.scripts.src = _.map(context.scripts.src, getRelativeModuleUrl); // Prepend loaderPlugins to the appropriate files @@ -173,5 +174,7 @@ exports.process = function(grunt, task, context) { context.temp); var source = grunt.file.read(template); - return grunt.util._.template(source, context); + var tpl = _.template(source); + + return tpl(context); };