fix(externals): improve fallback error handling

nitrojs · Apr 7, 2022 · 6b355ca · 6b355ca
1 parent b4ced48
commit 6b355ca
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/rollup/plugins/externals.ts b/src/rollup/plugins/externals.ts
@@ -60,18 +60,17 @@ export function externals (opts: NodeExternalsOptions): Plugin {
         return { id, external: true }
       }
 
-      // Resolve id (rollup > esm)
+      // Resolve id using rollup resolver
       const resolved = await this.resolve(originalId, importer, { ...options, skipSelf: true }) || { id }
+
+      // Try resolving with mlly as fallback
       if (!existsSync(resolved.id)) {
-        resolved.id = await _resolve(resolved.id)
+        resolved.id = await _resolve(resolved.id).catch(() => resolved.id)
       }
 
       // Inline invalid node imports
-      if (!await isValidNodeImport(resolved.id)) {
-        return {
-          ...resolved,
-          external: false
-        }
+      if (!await isValidNodeImport(resolved.id).catch(() => false)) {
+        return null
       }
 
       // Externalize with full path if trace is disabled