support symlinks, fixed webpack#554

sokra · sokra · commit ae79597e103f · 2015-01-17T21:57:28.000+01:00
diff --git a/lib/ResolverPlugin.js b/lib/ResolverPlugin.js
@@ -31,3 +31,4 @@ ResolverPlugin.DirectoryDefaultFilePlugin = require("enhanced-resolve/lib/Direct
 ResolverPlugin.DirectoryDescriptionFilePlugin = require("enhanced-resolve/lib/DirectoryDescriptionFilePlugin");
 ResolverPlugin.FileAppendPlugin = require("enhanced-resolve/lib/FileAppendPlugin");
 ResolverPlugin.DirectoryResultPlugin = require("enhanced-resolve/lib/DirectoryResultPlugin");
+ResolverPlugin.ResultSymlinkPlugin = require("enhanced-resolve/lib/ResultSymlinkPlugin");
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -50,6 +50,7 @@ var DirectoryDescriptionFilePlugin = require("enhanced-resolve/lib/DirectoryDesc
 var DirectoryDescriptionFileFieldAliasPlugin = require("enhanced-resolve/lib/DirectoryDescriptionFileFieldAliasPlugin");
 var FileAppendPlugin = require("enhanced-resolve/lib/FileAppendPlugin");
 var DirectoryResultPlugin = require("enhanced-resolve/lib/DirectoryResultPlugin");
+var ResultSymlinkPlugin = require("enhanced-resolve/lib/ResultSymlinkPlugin");
 
 
 function WebpackOptionsApply() {
@@ -328,7 +329,8 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 		new ModuleAsDirectoryPlugin("module"),
 		new DirectoryDescriptionFilePlugin("package.json", options.resolve.packageMains),
 		new DirectoryDefaultFilePlugin(["index"]),
-		new FileAppendPlugin(options.resolve.extensions)
+		new FileAppendPlugin(options.resolve.extensions),
+		new ResultSymlinkPlugin()
 	);
 	compiler.resolvers.context.apply(
 		new UnsafeCachePlugin(options.resolve.unsafeCache),
@@ -338,7 +340,8 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 		makeRootPlugin("module", options.resolve.fallback),
 		new ModuleAsFilePlugin("module"),
 		new ModuleAsDirectoryPlugin("module"),
-		new DirectoryResultPlugin()
+		new DirectoryResultPlugin(),
+		new ResultSymlinkPlugin()
 	);
 	compiler.resolvers.loader.apply(
 		new UnsafeCachePlugin(options.resolve.unsafeCache),
@@ -351,7 +354,8 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 		new ModuleAsDirectoryPlugin("module"),
 		new DirectoryDescriptionFilePlugin("package.json", options.resolveLoader.packageMains),
 		new DirectoryDefaultFilePlugin(["index"]),
-		new FileAppendPlugin(options.resolveLoader.extensions)
+		new FileAppendPlugin(options.resolveLoader.extensions),
+		new ResultSymlinkPlugin()
 	);
 	compiler.applyPlugins("after-resolvers", compiler);
 	return options;
diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
 		"optimist": "~0.6.0",
 		"uglify-js": "~2.4.13",
 		"async": "~0.9.0",
-		"enhanced-resolve": "~0.7.0",
-		"memory-fs": "~0.1.0",
+		"enhanced-resolve": "~0.8.2",
+		"memory-fs": "~0.2.0",
 		"clone": "~0.1.15",
 		"webpack-core": "~0.4.8",
 		"node-libs-browser": "~0.4.0",
