root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix

This commit is contained in:
Tobias Koppers 2012-10-21 23:34:30 +02:00
parent 466ec90ffa
commit ef199fbc89
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/buildDeps.js
View File

@ -409,7 +409,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
}); });
options.workers.run("buildModule", context, filenameWithLoaders, options.workers.run("buildModule", context, filenameWithLoaders,
preLoaders, loaders, postLoaders, preLoaders, loaders, postLoaders,
filename, opt, function(err, source, deps, cacheInfo, profileBuild) { filename, opt, function(err, extraResults, source, deps) {
if(err) err = { if(err) err = {
message: err.message, message: err.message,
stack: err.stack, stack: err.stack,
@ -418,7 +418,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
return this._toString return this._toString
} }
} }
callback(err, source, deps, cacheInfo, profileBuild); callback(err, extraResults, source, deps);
}); });
} }
@ -442,7 +442,6 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
function seperateResolveLoaders() { function seperateResolveLoaders() {
var args = Array.prototype.slice.call(arguments, 0); var args = Array.prototype.slice.call(arguments, 0);
var workers = args[0];
args.unshift("resolve.loaders"); args.unshift("resolve.loaders");
var callback = args.pop(); var callback = args.pop();
args.push(function(err, loaders) { args.push(function(err, loaders) {
@ -456,7 +455,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
} }
callback(err, loaders); callback(err, loaders);
}); });
workers.run.apply(workers, args); options.workers.run.apply(workers, args);
} }
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "webpack", "name": "webpack",
"version": "0.7.3", "version": "0.7.4",
"author": "Tobias Koppers @sokra", "author": "Tobias Koppers @sokra",
"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.", "description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",
"dependencies": { "dependencies": {