@markuplint/file-resolver 4.9.13 → 4.9.14-dev.110

package/lib/general-import.js

@@ -19,30 +19,25 @@ export async function generalImport(name) {
         cache.set(name, mod);
         return mod;
     }
-    catch (error) {
-        if (
-        // @ts-ignore
-        'code' in error &&
-            // @ts-ignore
-            error.code === 'ERR_IMPORT_ASSERTION_TYPE_MISSING') {
-            try {
-                const mod = require(name) ?? null;
-                gLogSuccess('Success by require("%s"): %O', name, mod);
-                cache.set(name, mod);
-                return mod;
-            }
-            catch (error) {
-                if (error instanceof Error && /^parse failure/i.test(error.message)) {
-                    gLogError('Error in `createRequire(import.meta.url)()`: %O', error);
-                    cache.set(name, null);
-                    return null;
-                }
-                gLogError('Error in generalImport: %O', error);
+    catch (importError) {
+        gLog('Error in `import()`: %O', importError);
+        // If import() fails, try require() regardless of error code
+        try {
+            const mod = require(name) ?? null;
+            gLogSuccess('Success by require("%s"): %O', name, mod);
+            cache.set(name, mod);
+            return mod;
+        }
+        catch (requireError) {
+            if (requireError instanceof Error && /^parse failure/i.test(requireError.message)) {
+                gLogError('Error in `createRequire(import.meta.url)()`: %O', requireError);
+                cache.set(name, null);
+                return null;
             }
+            gLogError('Error in generalImport: %O', requireError);
         }
-        if (error instanceof Error) {
-            const { filePath, packageName } = /Missing\s"(?<filePath>[^"]+)"\sspecifier\sin\s"(?<packageName>[^"]+)"\spackage/.exec(error.message)
-                ?.groups ?? {};
+        if (importError instanceof Error) {
+            const { filePath, packageName } = /Missing\s"(?<filePath>[^"]+)"\sspecifier\sin\s"(?<packageName>[^"]+)"\spackage/.exec(importError.message)?.groups ?? {};
             if (filePath && packageName) {
                 const modFile = resolve(packageName, import.meta.url);
                 const modPath = path.dirname(modFile);
@@ -60,7 +55,7 @@ export async function generalImport(name) {
             cache.set(name, json);
             return json;
         }
-        gLogError('Error in `import()`: %O', error);
+        gLogError('Error in `import()`: %O', importError);
         cache.set(name, null);
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "4.9.13",
+	"version": "4.9.14-dev.110+16e148e6e",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,17 +25,17 @@
 		"clean": "tsc --build --clean"
 	},
 	"devDependencies": {
-		"@types/node": "22.13.10"
+		"@types/node": "22.14.1"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.6.18",
-		"@markuplint/ml-ast": "4.4.9",
-		"@markuplint/ml-config": "4.8.10",
-		"@markuplint/ml-core": "4.12.3",
-		"@markuplint/ml-spec": "4.9.5",
-		"@markuplint/parser-utils": "4.8.6",
-		"@markuplint/selector": "4.7.3",
-		"@markuplint/shared": "4.4.10",
+		"@markuplint/html-parser": "4.6.19-dev.110+16e148e6e",
+		"@markuplint/ml-ast": "4.4.10-dev.350+16e148e6e",
+		"@markuplint/ml-config": "4.8.11-dev.110+16e148e6e",
+		"@markuplint/ml-core": "4.12.4-dev.110+16e148e6e",
+		"@markuplint/ml-spec": "4.9.6-dev.110+16e148e6e",
+		"@markuplint/parser-utils": "4.8.7-dev.110+16e148e6e",
+		"@markuplint/selector": "4.7.4-dev.110+16e148e6e",
+		"@markuplint/shared": "4.4.11-dev.350+16e148e6e",
 		"cosmiconfig": "9.0.0",
 		"debug": "4.4.0",
 		"glob": "11.0.1",
@@ -44,5 +44,5 @@
 		"jsonc": "2.0.0",
 		"minimatch": "10.0.1"
 	},
-	"gitHead": "04924b5471e60820d28c1f48c2f09a537a1e9825"
+	"gitHead": "16e148e6ec2abac673c5ea1e42bbb666d421f357"
 }