opensourcemirror
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed output of deps

This commit is contained in:
Tobias Koppers 2012-03-15 00:21:52 +01:00
parent 6d1a7a77d6
commit 4c0f2244c0
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/webpack.js
View File

@ -128,8 +128,11 @@ if(argv.single) {
case "context":
console.log(" \033[90mcontext from " + reason.filename + "\033[39m");
break;
case "ensure":
console.log(" \033[35mensure from " + reason.filename + "\033[39m");
case "async require":
console.log(" \033[35masync require (" + reason.count + "x) from " + reason.filename + "\033[39m");
break;
case "async context":
console.log(" \033[35masync context from " + reason.filename + "\033[39m");
break;
default:
console.log(" \033[31m" + reason.type + "\033[39m");

22
lib/buildDeps.js
View File

@ -94,8 +94,8 @@ function addModule(depTree, context, module, options, reason, callback) {
module.contexts = deps.contexts || [];
module.source = source;
var requires = {};
var contexts = [];
var requires = {}, directRequire = {};
var contexts = [], directContexts = {};
function add(r) {
requires[r.name] = requires[r.name] || [];
requires[r.name].push(r);
@ -105,10 +105,18 @@ function addModule(depTree, context, module, options, reason, callback) {
contexts.push({context: c, module: m});
}
}
if(module.requires)
if(module.requires) {
module.requires.forEach(add);
if(module.contexts)
module.requires.forEach(function(r) {
directRequire[r.name] = true;
});
}
if(module.contexts) {
module.contexts.forEach(addContext(module));
module.contexts.forEach(function(c) {
directContexts[c.name] = true;
});
}
if(module.asyncs)
module.asyncs.forEach(function addAsync(c) {
if(c.requires)
@ -124,7 +132,7 @@ function addModule(depTree, context, module, options, reason, callback) {
if(requiresNames.length)
requiresNames.forEach(function(moduleName) {
var reason = {
type: "require",
type: directRequire[moduleName] ? "require" : "async require",
count: requires[moduleName].length,
filename: filename
};
@ -144,7 +152,7 @@ function addModule(depTree, context, module, options, reason, callback) {
var context = contextObj.context;
var module = contextObj.module;
var reason = {
type: "ensure",
type: directContexts[context.name] ? "context" : "async context",
filename: filename
};
addContextModule(depTree, path.dirname(filename), context.name, options, reason, function(err, contextModuleId) {
@ -244,7 +252,7 @@ function addContextModule(depTree, context, contextModuleName, options, reason,
type: "context",
filename: reason.filename
};
addModule(depTree, null, filename, options, modulereason, function(err, moduleId) {
addModule(depTree, null, filename, options, reason, function(err, moduleId) {
if(err) {
endOne(err);
} else {

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "webpack",
"version": "0.2.1",
"version": "0.2.2",
"author": "Tobias Koppers @sokra",
"description": "Packs CommonJs Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand.",
"dependencies": {