Merge pull request #1655 from DanielXMoore/unplugin-fix

Extension bug fix for unplugin on webpack; cleanup old bug workarounds
DanielXMoore · Dec 22, 2024 · 458c389 · 458c389
2 parents fbc9b46 + 446da67
commit 458c389
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/source/unplugin/unplugin.civet b/source/unplugin/unplugin.civet
@@ -142,7 +142,7 @@ export const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0] =
 
   cache := new Map<string, CacheEntry> unless options.cache is false
 
-  plugin: ReturnType<typeof rawPlugin> & { __virtualModulePrefix?: string } := {
+  plugin: ReturnType<typeof rawPlugin> := {
     name: 'unplugin-civet'
     enforce: 'pre'
 
@@ -369,15 +369,6 @@ export const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0] =
                   compilerOptions.outDir ?? process.cwd()
                   filePath
 
-                // Work around unplugin+esbuild bug where it only creates the
-                // root output directory, not any subdirectories.
-                if meta.framework is 'esbuild'
-                  fs.mkdirSync
-                    path.dirname(
-                      path.resolve(esbuildOptions.outdir!, pathFromDistDir)
-                    )
-                    recursive: true
-
                 this.emitFile
                   source: content
                   fileName: pathFromDistDir
@@ -392,15 +383,6 @@ export const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0] =
       id = aliasResolver id if aliasResolver?
       if (/\0/.test(id)) return null
 
-      // unplugin webpack virtualizes our resolved paths, by prepending
-      // plugin.__virtualModulePrefix and then encodeURIComponent.
-      // [https://github.com/unjs/unplugin/blob/f6ceb5092715b8047eeb069b249b919f3ef2bcfb/src/webpack/index.ts#L131]
-      // Undo this transformation on the `importer` path
-      // so we can correctly resolve its directory.
-      if plugin.__virtualModulePrefix and
-         importer?.startsWith plugin.__virtualModulePrefix
-        importer = decodeURIComponent importer[plugin.__virtualModulePrefix#..]
-
       let postfix: string
       {id, postfix} = cleanCivetId(id)
       resolvedId .=
@@ -598,7 +580,12 @@ export const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0] =
     }
 
     webpack(compiler)
-      compiler.options.resolve.extensions.unshift ".civet" if implicitExtension
+      if implicitExtension
+        compiler.options ?= {}
+        compiler.options.resolve ?= {}
+        // Default from https://webpack.js.org/configuration/resolve/#resolveextensions
+        compiler.options.resolve.extensions ?= ['', '.js', '.json', '.wasm']
+        compiler.options.resolve.extensions.unshift ".civet"
       aliasResolver = (id) =>
         // Based on normalizeAlias from
         // https://github.com/webpack/enhanced-resolve/blob/72999caf002f6f7bb4624e65fdeb7ba980b11e24/lib/ResolverFactory.js#L158