捕获modules缺失时import失败的报错

LISTENAI · Mar 16, 2023 · 2f4e82f · 2f4e82f
1 parent 630adf8
commit 2f4e82f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lisa-plugin/zephyr",
-  "version": "1.7.1-beta.5",
+  "version": "1.7.1-beta.6",
   "description": "LISA plugin for Zephyr",
   "main": "./lib/main.js",
   "engines": {

diff --git a/src/env/index.ts b/src/env/index.ts
@@ -74,11 +74,19 @@ export async function loadBinaries(bundles?: Bundle[]): Promise<Record<string, B
   const binaries: Record<string, Binary> = {};
   for (const name of BUILTIN_BINARIES) {
     const unprefixedName = name.split('/').slice(1).join('/');
-    binaries[unprefixedName] = await typedImport<Binary>(name);  
+    try {
+      binaries[unprefixedName] = await typedImport<Binary>(name);    
+    } catch (error) {
+      binaries[unprefixedName] = <Binary>{}
+    }
   }
   for (const bundle of bundles || []) {
     for (const name of bundle.binaries || []) {
-      binaries[name] = await typedImport<Binary>(`${PACKAGE_MODULES_DIR}/@binary/${name}`);
+      try {
+        binaries[name] = await typedImport<Binary>(`${PACKAGE_MODULES_DIR}/@binary/${name}`);   
+      } catch (error) {
+        binaries[name] = <Binary>{};
+      }
     }
   }
   return binaries;

diff --git a/src/utils/typedImport.ts b/src/utils/typedImport.ts
@@ -3,10 +3,6 @@ interface Module<T> {
 }
 
 export default async function typedImport<T>(name: string): Promise<T> {
-  try {
-    const mod = await import(name) as Module<T>;
-    return mod.default;  
-  } catch (error) {
-    return <T>{}
-  }
+  const mod = await import(name) as Module<T>;
+  return mod.default;  
 }