Merge pull request #244 from webpack/bugfix/hash-folder

revert #folder handling
webpack · Sep 16, 2020 · 1916bf0 · 1916bf0
2 parents 151150f + 53fddeb
commit 1916bf0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/lib/util/identifier.js b/lib/util/identifier.js
@@ -12,9 +12,7 @@ const EMPTY = "";
  * @returns {[string, string, string]|null} parsed identifier
  */
 function parseIdentifier(identifier) {
-	const match = /^(#?(?:[/\\]#[^/\\?]|[^?#])*)(\?[^#]*)?(#.*)?$/.exec(
-		identifier
-	);
+	const match = /^(#?[^?#]*)(\?[^#]*)?(#.*)?$/.exec(identifier);
 
 	if (!match) return null;
 

diff --git a/test/identifier.js b/test/identifier.js
@@ -37,19 +37,19 @@ describe("parse identifier. edge cases", () => {
 		},
 		{
 			input: "path/#repo#hash",
-			expect: ["path/#repo", "", "#hash"]
+			expect: ["path/", "", "#repo#hash"]
 		},
 		{
 			input: "path/#r#hash",
-			expect: ["path/#r", "", "#hash"]
+			expect: ["path/", "", "#r#hash"]
 		},
 		{
 			input: "path/#repo/#repo2#hash",
-			expect: ["path/#repo/#repo2", "", "#hash"]
+			expect: ["path/", "", "#repo/#repo2#hash"]
 		},
 		{
 			input: "path/#r/#r#hash",
-			expect: ["path/#r/#r", "", "#hash"]
+			expect: ["path/", "", "#r/#r#hash"]
 		},
 		{
 			input: "path/#/not/a/hash?not-a-query",
@@ -77,11 +77,11 @@ describe("parse identifier. Windows-like paths", () => {
 		},
 		{
 			input: "path\\#repo#hash",
-			expect: ["path\\#repo", "", "#hash"]
+			expect: ["path\\", "", "#repo#hash"]
 		},
 		{
 			input: "path\\#r#hash",
-			expect: ["path\\#r", "", "#hash"]
+			expect: ["path\\", "", "#r#hash"]
 		},
 		{
 			input: "path\\#/not/a/hash?not-a-query",