Merge pull request #255 from webpack/bugfix/no-fragment

resolve folders which look like a fragment

Author: sokra

README.md

@@ -131,6 +131,12 @@ class MyResolverPlugin {
 
 Plugins are executed in a pipeline, and register which event they should be executed before/after. In the example above, `source` is the name of the event that starts the pipeline, and `target` is what event this plugin should fire, which is what continues the execution of the pipeline. For an example of how these different plugin events create a chain, see `lib/ResolverFactory.js`, in the `//// pipeline ////` section.
 
+## Escaping
+
+It's allowed to escape `#` as `\0#` to avoid parsing it as fragment.
+
+enhanced-resolve will try to resolve requests containing `#` as path and as fragment, so it will automatically figure out if `./some#thing` means `.../some.js#thing` or `.../some#thing.js`. When a `#` is resolved as path it will be escaped in the result. Here: `.../some\0#thing.js`.
+
 ## Tests
 
 ```javascript

lib/ParsePlugin.js

@@ -43,6 +43,31 @@ module.exports = class ParsePlugin {
 					if (parsed.directory)
 						resolveContext.log("Parsed request is a directory");
 				}
+				// There is an edge-case where a request with # can be a path or a fragment -> try both
+				if (obj.request && !obj.query && obj.fragment) {
+					const directory = obj.fragment.endsWith("/");
+					const alternative = {
+						...obj,
+						directory,
+						request:
+							obj.request +
+							(obj.directory ? "/" : "") +
+							(directory ? obj.fragment.slice(0, -1) : obj.fragment),
+						fragment: ""
+					};
+					resolver.doResolve(
+						target,
+						alternative,
+						null,
+						resolveContext,
+						(err, result) => {
+							if (err) return callback(err);
+							if (result) return callback(null, result);
+							resolver.doResolve(target, obj, null, resolveContext, callback);
+						}
+					);
+					return;
+				}
 				resolver.doResolve(target, obj, null, resolveContext, callback);
 			});
 	}

lib/Resolver.js

@@ -270,7 +270,9 @@ class Resolver {
 				null,
 				result.path === false
 					? false
-					: `${result.path}${result.query || ""}${result.fragment || ""}`,
+					: `${result.path.replace(/#/g, "\0#")}${
+							result.query ? result.query.replace(/#/g, "\0#") : ""
+					  }${result.fragment || ""}`,
 				result
 			);
 		};

lib/util/identifier.js

@@ -5,18 +5,22 @@
 
 "use strict";
 
-const EMPTY = "";
+const PATH_QUERY_FRAGMENT_REGEXP = /^(#?(?:\0.|[^?#\0])*)(\?(?:\0.|[^#\0])*)?(#.*)?$/;
 
 /**
  * @param {string} identifier identifier
  * @returns {[string, string, string]|null} parsed identifier
  */
 function parseIdentifier(identifier) {
-	const match = /^(#?[^?#]*)(\?[^#]*)?(#.*)?$/.exec(identifier);
+	const match = PATH_QUERY_FRAGMENT_REGEXP.exec(identifier);
 
 	if (!match) return null;
 
-	return [match[1] || EMPTY, match[2] || EMPTY, match[3] || EMPTY];
+	return [
+		match[1].replace(/\0(.)/g, "$1"),
+		match[2] ? match[2].replace(/\0(.)/g, "$1") : "",
+		match[3] || ""
+	];
 }
 
 module.exports.parseIdentifier = parseIdentifier;

test/fixtures/no#fragment/#/#.js

@@ -239,6 +239,27 @@ describe("resolve", function () {
 		path.join(fixtures, "main-field-self2", "index.js")
 	);
 
+	testResolve(
+		"handle fragment edge case (no fragment)",
+		fixtures,
+		"./no#fragment/#/#",
+		path.join(fixtures, "no\0#fragment/\0#", "\0#.js")
+	);
+
+	testResolve(
+		"handle fragment edge case (fragment)",
+		fixtures,
+		"./no#fragment/#/",
+		path.join(fixtures, "no.js") + "#fragment/#/"
+	);
+
+	testResolve(
+		"handle fragment escaping",
+		fixtures,
+		"./no\0#fragment/\0#/\0##fragment",
+		path.join(fixtures, "no\0#fragment/\0#", "\0#.js") + "#fragment"
+	);
+
 	it("should correctly resolve", function (done) {
 		const issue238 = path.resolve(fixtures, "issue-238");