some bugfixes and fallback option

Author: sokra

lib/Compiler.js

@@ -241,7 +241,7 @@ Compiler.prototype.newCompilation = function(params) {
 };
 
 Compiler.prototype.createNormalModuleFactory = function() {
-	var normalModuleFactory = new NormalModuleFactory(this.resolvers, this.parser, this.options.module || {});
+	var normalModuleFactory = new NormalModuleFactory(this.options.context, this.resolvers, this.parser, this.options.module || {});
 	this.applyPlugins("normal-module-factory", normalModuleFactory);
 	return normalModuleFactory;
 };

lib/NormalModuleFactory.js

@@ -8,14 +8,14 @@ var Tapable = require("tapable");
 var NormalModule = require("./NormalModule");
 var LoadersList = require("webpack-core/lib/LoadersList");
 
-function NormalModuleFactory(resolvers, parser, options) {
+function NormalModuleFactory(context, resolvers, parser, options) {
 	Tapable.call(this);
 	this.resolvers = resolvers;
 	this.parser = parser;
 	this.loaders = new LoadersList(options.loaders);
 	this.preLoaders = new LoadersList(options.preLoaders);
 	this.postLoaders = new LoadersList(options.postLoaders);
-	this.context = options.context || "";
+	this.context = context || "";
 }
 module.exports = NormalModuleFactory;
 

lib/WebpackOptionsApply.js

@@ -105,8 +105,9 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 	compiler.applyPlugins("after-plugins", compiler);
 	compiler.resolvers.normal.apply(
 		new ModuleAliasPlugin(options.resolve.alias),
-		new ModulesInDirectoriesPlugin("module", options.resolve.modulesDirectories),
 		makeRootPlugin(options.resolve.root),
+		new ModulesInDirectoriesPlugin("module", options.resolve.modulesDirectories),
+		makeRootPlugin(options.resolve.fallback),
 		new ModuleAsFilePlugin("module"),
 		new ModuleAsDirectoryPlugin("module"),
 		new DirectoryDescriptionFilePlugin("package.json", ["webpack", "browserify", "web", ["jam", "main"], "main"]),
@@ -115,16 +116,18 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 	);
 	compiler.resolvers.context.apply(
 		new ModuleAliasPlugin(options.resolve.alias),
-		new ModulesInDirectoriesPlugin("module", options.resolve.modulesDirectories),
 		makeRootPlugin(options.resolve.root),
+		new ModulesInDirectoriesPlugin("module", options.resolve.modulesDirectories),
+		makeRootPlugin(options.resolve.fallback),
 		new ModuleAsFilePlugin("module"),
 		new ModuleAsDirectoryPlugin("module"),
 		new DirectoryResultPlugin()
 	);
 	compiler.resolvers.loader.apply(
 		new ModuleAliasPlugin(options.resolveLoader.alias),
-		new ModulesInDirectoriesPlugin("loader-module", options.resolveLoader.modulesDirectories),
 		makeRootPlugin(options.resolveLoader.root),
+		new ModulesInDirectoriesPlugin("loader-module", options.resolveLoader.modulesDirectories),
+		makeRootPlugin(options.resolveLoader.fallback),
 		new ModuleTemplatesPlugin("loader-module", options.resolveLoader.moduleTemplates, "module"),
 		new ModuleAsFilePlugin("module"),
 		new ModuleAsDirectoryPlugin("module"),

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.9.0-beta6",
+	"version": "0.9.0-beta7",
 	"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 loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",
 	"dependencies": {