Merge pull request #1867 from DanielXMoore/unplugin-hash

Author: edemaine

source/unplugin/unplugin.civet

@@ -52,7 +52,8 @@ type CacheEntry
   result?: TransformResult
   promise?: Promise<void>
 
-postfixRE := /[?#].*$/s
+queryPostfixRE := /\?.*$/s
+escapedHashRE := /\0#/g
 isWindows := os.platform() is 'win32'
 windowsSlashRE := /\\/g
 civetSuffix := '.civet'
@@ -67,19 +68,33 @@ or needs an implicit .civet extension, or isn't Civet-related at all.
 */
 function extractCivetFilename(id: string, outputExtension: string): {filename: string, postfix: string}
   postfix .= ''
-  filename .= id.replace postfixRE, (match) =>
+  // Webpack escapes literal `#` in `loaderContext.resource` as `\0#` so it
+  // can distinguish path characters from fragment suffixes. Undo that first.
+  id = id.replace escapedHashRE, '#'
+  // `?` is always treated as a suffix. Raw `?` is impossible in Windows paths,
+  // and we rely on query suffixes across bundlers.
+  filename .= id.replace queryPostfixRE, (match) =>
     postfix = match
     ''
   // Normally the outputExtension (.jsx/.tsx by default) should be present,
   // but sometimes (e.g. esbuild's alias feature) load directly without resolve
   if filename.endsWith outputExtension
     filename = filename[< -outputExtension#]
+  // `#` may be either a literal path character or a fragment-like suffix.
+  // Keep it when the file exists as written; otherwise strip one rightmost
+  // `#...` suffix and let later resolution check whether file exists.
+  hashIndex := filename.lastIndexOf '#'
+  if hashIndex >= 0 and not tryStatSync filename
+    postfix = filename[hashIndex..] + postfix
+    filename = filename[..<hashIndex]
+    if filename.endsWith outputExtension
+      filename = filename[< -outputExtension#]
   {filename, postfix}
 
 function tryStatSync(file: string): fs.Stats?
   try
     // The "throwIfNoEntry" is a performance optimization for cases where the file does not exist
-    return fs.statSync(file, { throwIfNoEntry: false });
+    return fs.statSync file, throwIfNoEntry: false
 
 export function slash(p: string): string
   p.replace windowsSlashRE, '/'