JavaScriptExample
diff --git a/‎lib/buildDeps.js‎
Lines changed: 2 additions & 2 deletions b/‎lib/buildDeps.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/execLoaders.js‎
Lines changed: 7 additions & 5 deletions b/‎lib/execLoaders.js‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎package.json‎
Lines changed: 1 addition & 1 deletion b/‎package.json‎
Lines changed: 1 addition & 1 deletion
@@ -101,7 +101,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
 	}
 
 	// resolve the filename of the required module
-	resolve(context || path.dirname(modu), modu, options.resolve, resolved);
+	resolve(context = context || path.dirname(modu), modu, options.resolve, resolved);
 	function resolved(err, filename) {
 		if(err) {
 			callback(err);
@@ -134,7 +134,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {
 				}
 
 				// exec the loaders
-				execLoaders(filenameWithLoaders, loaders, [filename], [content], options, processJs);
+				execLoaders(context, filenameWithLoaders, loaders, [filename], [content], options, processJs);
 
 				// process the finished javascript code
 				// for inclusion into the result
 
@@ -8,14 +8,15 @@ var path = require("path");
 
 /**
  * execLoaders
+ * @param context {string}			the context from which this request is coming
  * @param request {string}			the compile request string
  * @param loaders {string[]}		the absolute filenames of the loaders
  * @param filenames {string[]}		the filenames of "contents"
  * @param contents {Buffer[]}		read contents
  * @param options {object}			the options of the module system
  * @param callback {function}		(err, resultingJavascriptCode)
  */
-module.exports = function(request, loaders, filenames, contents, options, callback) {
+module.exports = function(context, request, loaders, filenames, contents, options, callback) {
 	if(loaders.length === 0)
 		// if no loaders are used, the file content is the resulting code
 		callback(null, contents[0].toString("utf-8"));
@@ -49,7 +50,8 @@ module.exports = function(request, loaders, filenames, contents, options, callba
 				try {
 					// prepare the loader "this" context
 					// see "Loader Specification" in wiki
-					var context = {
+					var loaderContext = {
+						context: context,
 						request: request,
 						filenames: filenames,
 						exec: function(code, filename) {
@@ -65,7 +67,7 @@ module.exports = function(request, loaders, filenames, contents, options, callba
 						},
 						async: function() {
 							async = true;
-							return context.callback;
+							return loaderContext.callback;
 						},
 						callback: function(err) {
 							async = true;
@@ -98,7 +100,7 @@ module.exports = function(request, loaders, filenames, contents, options, callba
 
 					// add additional loader context params or functions
 					if(options.loader) for(var key in options.loader)
-						context[key] = options.loader[key];
+						loaderContext[key] = options.loader[key];
 
 					// convert all parameters to strings if they are Buffers
 					var params = [];
@@ -110,7 +112,7 @@ module.exports = function(request, loaders, filenames, contents, options, callba
 					});
 
 					// exec to loader
-					var retVal = loaderFunctions.pop().apply(context, params);
+					var retVal = loaderFunctions.pop().apply(loaderContext, params);
 
 					// if it isn't asynchron, use the return value
 					if(!async) {
 
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.4.2",
+	"version": "0.4.3",
 	"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. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",
 	"dependencies": {
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// resolve the filename of the required module`
`104`		`- resolve(context \|\| path.dirname(modu), modu, options.resolve, resolved);`
	`104`	`+ resolve(context = context \|\| path.dirname(modu), modu, options.resolve, resolved);`
`105`	`105`	`function resolved(err, filename) {`
`106`	`106`	`if(err) {`
`107`	`107`	`callback(err);`
`@@ -134,7 +134,7 @@ function addModule(depTree, context, modu, options, reason, finalCallback) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// exec the loaders`
`137`		`- execLoaders(filenameWithLoaders, loaders, [filename], [content], options, processJs);`
	`137`	`+ execLoaders(context, filenameWithLoaders, loaders, [filename], [content], options, processJs);`
`138`	`138`
`139`	`139`	`// process the finished javascript code`
`140`	`140`	`// for inclusion into the result`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.4.2",`
	`3`	`+ "version": "0.4.3",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs 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.",`
`6`	`6`	`"dependencies": {`