From e42701dc6f9b035bfbb5d0fffded905d8b456db4 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 21 Jan 2013 09:07:54 +0100 Subject: [PATCH] fixes #54 --- lib/webpack.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/webpack.js b/lib/webpack.js index 65a991570..468f31e28 100644 --- 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 index 39446a039..4c8fd1c5f 100644 --- 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": {