grunt-webpack
Advanced tools
Comparing version 0.10.3 to 0.10.4
{ | ||
"name": "grunt-webpack", | ||
"description": "Use webpack with grunt.", | ||
"version": "0.10.3", | ||
"version": "0.10.4", | ||
"homepage": "https://github.com/webpack/grunt-webpack", | ||
@@ -16,2 +16,5 @@ "author": { | ||
}, | ||
"dependencies": { | ||
"lodash": "~1.2.0" | ||
}, | ||
"peerDependencies": { | ||
@@ -18,0 +21,0 @@ "webpack": "0.10.x" |
@@ -10,2 +10,3 @@ /* | ||
var path = require("path"); | ||
var _ = require("lodash"); | ||
module.exports = function(grunt) { | ||
@@ -24,3 +25,8 @@ | ||
// Get options from this.data | ||
var options = grunt.util._.merge( | ||
function getWithPlugins(ns) { | ||
var obj = grunt.config(ns); | ||
if(obj.plugins) obj.plugins = grunt.config.getRaw(ns.concat(["plugins"])); | ||
return obj; | ||
} | ||
var options = _.merge( | ||
{ | ||
@@ -33,4 +39,4 @@ context: ".", | ||
}, | ||
grunt.config([this.name, "options"]), | ||
this.data, | ||
getWithPlugins([this.name, "options"]), | ||
getWithPlugins([this.name, this.target]), | ||
function(a, b) { | ||
@@ -37,0 +43,0 @@ return grunt.util._.isArray(a) && grunt.util._.isArray(b) ? a.concat(b) : undefined; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
6331
105
2
+ Addedlodash@~1.2.0
+ Addedlodash@1.2.1(transitive)