fixes webpack#54

sokra · sokra · commit e42701dc6f9b · 2013-01-21T09:07:54.000+01:00
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -107,7 +107,7 @@ module.exports = function webpackMain(context, moduleName, options, callback) {
 	if(!options.resolve.postfixes)
 		options.resolve.postfixes = ["", "-webpack", "-web"];
 	if(!options.resolve.packageMains)
-		options.resolve.packageMains = ["webpack", "browserify", "web", "main"];
+		options.resolve.packageMains = ["webpack", "browserify", "web", ["jam","main"], "main"];
 	if(!options.resolve.loaderExtensions)
 		options.resolve.loaderExtensions = [".webpack-web-loader.js", ".webpack-loader.js", ".web-loader.js", ".loader.js", "", ".js"];
 	if(!options.resolve.loaderPostfixes)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.8.2",
+	"version": "0.8.3",
 	"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.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.8.2",`
	`3`	`+ "version": "0.8.3",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"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.",`
`6`	`6`	`"dependencies": {`