mirror of https://github.com/webpack/webpack.git
final fixes
This commit is contained in:
parent
41946d2450
commit
b8be5e9bf5
|
@ -302,7 +302,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
|
||||||
var reason = {
|
var reason = {
|
||||||
type: directRequire[moduleName] ? "require" : "async require",
|
type: directRequire[moduleName] ? "require" : "async require",
|
||||||
count: requires[moduleName].length,
|
count: requires[moduleName].length,
|
||||||
filename: filename
|
filename: filenameWithLoaders
|
||||||
};
|
};
|
||||||
|
|
||||||
// create or get the module for each require
|
// create or get the module for each require
|
||||||
|
@ -324,7 +324,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
|
||||||
var module = contextObj.module;
|
var module = contextObj.module;
|
||||||
var reason = {
|
var reason = {
|
||||||
type: directContexts[context.name] ? "context" : "async context",
|
type: directContexts[context.name] ? "context" : "async context",
|
||||||
filename: filename
|
filename: filenameWithLoaders
|
||||||
};
|
};
|
||||||
|
|
||||||
// create of get the context module for each require.context
|
// create of get the context module for each require.context
|
||||||
|
@ -516,6 +516,7 @@ function addContextModule(depTree, context, contextModuleName, options, reason,
|
||||||
}
|
}
|
||||||
var modulereason = {
|
var modulereason = {
|
||||||
type: "context",
|
type: "context",
|
||||||
|
dirname: contextModuleNameWithLoaders,
|
||||||
filename: reason.filename
|
filename: reason.filename
|
||||||
};
|
};
|
||||||
// add each file as module
|
// add each file as module
|
||||||
|
|
|
@ -453,6 +453,8 @@ function webpack(context, moduleName, options, callback) {
|
||||||
toCache: modu.toCache,
|
toCache: modu.toCache,
|
||||||
seperate: modu.seperate,
|
seperate: modu.seperate,
|
||||||
profile: modu.profile,
|
profile: modu.profile,
|
||||||
|
loaders: modu.loaders,
|
||||||
|
dependencies: modu.dependencies,
|
||||||
reasons: modu.reasons});
|
reasons: modu.reasons});
|
||||||
sum++;
|
sum++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "webpack",
|
"name": "webpack",
|
||||||
"version": "0.7.0-beta8",
|
"version": "0.7.0",
|
||||||
"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": {
|
||||||
|
|
Loading…
Reference in New Issue