fix: force commonjs resolving for chevrotain

codesandbox · Jan 15, 2025 · fad8994 · fad8994
1 parent 448c25b
commit fad8994
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/packages/sandpack-core/src/resolver/utils/exports.ts b/packages/sandpack-core/src/resolver/utils/exports.ts
@@ -25,7 +25,8 @@ export function normalizePackageExport(
 
 export function extractPathFromExport(
   exportValue: PackageExportType,
-  pkgRoot: string
+  pkgRoot: string,
+  checkedExportKeys: string[] = EXPORTS_KEYS
 ): string | false {
   if (!exportValue) {
     return false;
@@ -46,13 +47,17 @@ export function extractPathFromExport(
   }
 
   if (typeof exportValue === 'object') {
-    for (const key of EXPORTS_KEYS) {
+    for (const key of checkedExportKeys) {
       const exportFilename = exportValue[key];
       if (exportFilename !== undefined) {
         if (typeof exportFilename === 'string') {
           return normalizePackageExport(exportFilename, pkgRoot);
         }
-        return extractPathFromExport(exportFilename, pkgRoot);
+        return extractPathFromExport(
+          exportFilename,
+          pkgRoot,
+          checkedExportKeys
+        );
       }
     }
     return false;

diff --git a/packages/sandpack-core/src/resolver/utils/pkg-json.ts b/packages/sandpack-core/src/resolver/utils/pkg-json.ts
@@ -8,6 +8,11 @@ const PKG_ALIAS_FIELDS = ['browser', 'alias'];
 
 type AliasesDict = { [key: string]: string };
 
+const COMMONJS_EXPORT_KEYS = ['browser', 'development', 'default', 'require'];
+function forceCommonJs(name: string, version: string): boolean {
+  return name === 'chevrotain' && version.startsWith('10.');
+}
+
 export interface ProcessedPackageJSON {
   aliases: AliasesDict;
   hasExports: boolean;
@@ -43,7 +48,15 @@ export function processPackageJSON(
     } else if (typeof content.exports === 'object') {
       const exportKeys = Object.keys(content.exports);
       if (!exportKeys[0].startsWith('.')) {
-        const resolvedExport = extractPathFromExport(content.exports, pkgRoot);
+        const checkedExportKeys = forceCommonJs(content.name, content.version)
+          ? COMMONJS_EXPORT_KEYS
+          : undefined;
+
+        const resolvedExport = extractPathFromExport(
+          content.exports,
+          pkgRoot,
+          checkedExportKeys
+        );
         if (!resolvedExport) {
           throw new Error(`Could not find a valid export for ${pkgRoot}`);
         }