fix(externals): rewrite traced file paths to latest semver-minor vers…

…ion (unjs#578)

src/rollup/plugins/externals.ts

@@ -183,7 +183,7 @@ export function externals (opts: NodeExternalsOptions): Plugin {
           const isNewer = semver.gt(v2, v1)
 
           // Warn about major version differences
-          const getMajor = v => v.split('.').filter(s => s !== '0')[0]
+          const getMajor = (v: string) => v.split('.').filter(s => s !== '0')[0]
           if (getMajor(v1) !== getMajor(v2)) {
             const warn = `Multiple major versions of package \`${pkgName}\` are being externalized. Picking latest version:\n\n` + [
               `  ${isNewer ? '-' : '+'} ` + existingPkgDir + '@' + v1,
@@ -195,13 +195,14 @@ export function externals (opts: NodeExternalsOptions): Plugin {
             }
           }
 
-          // Exclude older version files
-          if (isNewer) {
-            ignoreDirs.push(existingPkgDir)
-          } else {
-            ignoreDirs.push(pkgDir)
-            pkgDir = existingPkgDir // Update for tracedPackages
+          const [newerDir, olderDir] = isNewer ? [pkgDir, existingPkgDir] : [existingPkgDir, pkgDir]
+          // Try to map traced files from one package to another for minor/patch versions
+          if (getMajor(v1) === getMajor(v2)) {
+            tracedFiles = tracedFiles.map(f => f.startsWith(olderDir + '/') ? f.replace(olderDir, newerDir) : f)
           }
+          // Exclude older version files
+          ignoreDirs.push(olderDir + '/')
+          pkgDir = newerDir // Update for tracedPackages
         }
 
         // Add to traced packages
@@ -224,9 +225,13 @@ export function externals (opts: NodeExternalsOptions): Plugin {
         if (!await isFile(file)) { return }
         const src = resolve(opts.traceOptions.base, file)
         const { pkgName, subpath } = parseNodeModulePath(file)
-        const dst = resolve(opts.outDir, `node_modules/${pkgName}/${subpath}`)
+        const dst = resolve(opts.outDir, `node_modules/${pkgName + subpath}`)
         await fsp.mkdir(dirname(dst), { recursive: true })
-        await fsp.copyFile(src, dst)
+        try {
+          await fsp.copyFile(src, dst)
+        } catch (err) {
+          consola.warn(`Could not resolve \`${src}\`. Skipping.`)
+        }
       }
 
       // Write traced files

test/fixture/routes/modules.ts

@@ -4,11 +4,14 @@ import depA from 'nitro-dep-a'
 import depB from 'nitro-dep-b'
 // @ts-ignore
 import depLib from 'nitro-lib'
+// @ts-ignore
+import subpathLib from 'nitro-lib/subpath'
 
 export default defineEventHandler(() => {
   return {
     depA,
     depB,
-    depLib
+    depLib,
+    subpathLib
   }
 })

test/tests.ts

@@ -185,7 +185,7 @@ export function testNitro (ctx: Context, getHandler: () => TestHandler | Promise
 
     it('resolve module version conflicts', async () => {
       const { data } = await callHandler({ url: '/modules' })
-      expect(data).toMatchObject({ depA: '2.0.1', depB: '2.0.1', depLib: '2.0.1' })
+      expect(data).toMatchObject({ depA: '2.0.1', depB: '2.0.1', depLib: '2.0.1', subpathLib: '2.0.1' })
     })
   }
 }