ee-core 2.11.0-beta.1 → 2.11.1

package/core/lib/loader/file_loader.js

@@ -210,8 +210,11 @@ class FileLoader {
       for (const addonName of addonpaths) {
         if (filterAddons.includes(addonName)) continue;
 
-        let fullpath = path.join(directory, addonName, 'index');
-        fullpath = loader.resolveModule(fullpath);
+        const filepath = path.join(directory, addonName, 'index');
+        const fullpath = loader.resolveModule(filepath);
+        if (!fs.existsSync(fullpath)) {
+          throw new Error(`The ${filepath} file does not exist`);
+        }
         if (!fs.statSync(fullpath).isFile()) continue;
   
         let exports = getExports(fullpath, this.options, addonName);

package/loader/index.js

@@ -24,7 +24,6 @@ module.exports = {
     filepath = filepath && this.resolveModule(filepath);
     if (!fs.existsSync(filepath)) {
       let errorMsg = `[ee-core] [loader/index] loadOneFile ${filepath} does not exist`;
-      Log.coreLogger.error(errorMsg);
       throw new Error(errorMsg);
     }
 
@@ -45,8 +44,7 @@ module.exports = {
   loadJsFile (filepath) {
     if (!fs.existsSync(filepath)) {
       let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(errMsg);
-      return;
+      throw new Error(errMsg);
     }
 
     const ret = UtilsCore.loadFile(filepath);
@@ -64,8 +62,7 @@ module.exports = {
   execJsFile (filepath, ...inject) {
     if (!fs.existsSync(filepath)) {
       let errMsg = `[ee-core] [loader] loadJobFile ${filepath} does not exist`;
-      Log.coreLogger.error(errMsg);
-      return;
+      throw new Error(errMsg);
     }
 
     let ret = UtilsCore.loadFile(filepath);
@@ -97,7 +94,7 @@ module.exports = {
 
       if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
         let files = { filepath, fullpath }
-        Log.coreLogger.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
+        console.warn(`[ee-core] [loader] resolveModule unknow filepath: ${files}`)
         return undefined;
       }
     }
@@ -122,7 +119,7 @@ module.exports = {
     fullpath = this.resolveModule(filepath);
     if (!fs.existsSync(fullpath)) {
       let errorMsg = `[ee-core] [loader] requireModule filepath: ${filepath} does not exist`;
-      Log.coreLogger.error(errorMsg);
+      throw new Error(errorMsg);
     }
     const ret = UtilsCore.loadFile(fullpath);
 

package/main/index.js

@@ -43,13 +43,13 @@ class ElectronEgg {
       baseDir = Ps.getEncryptDir(app.getAppPath());
     }
 
-    let indexFile = path.join(baseDir, 'index');
-    indexFile = Loader.resolveModule(indexFile);
-    if (!fs.existsSync(indexFile)) {
+    const indexFile = path.join(baseDir, 'index');
+    const indexModulePath = Loader.resolveModule(indexFile);
+    if (!fs.existsSync(indexModulePath)) {
       throw new Error(`The ${indexFile} file does not exist`);
     }
 
-    const EEApp = UtilsCore.loadFile(indexFile);
+    const EEApp = UtilsCore.loadFile(indexModulePath);
     EE.app = new EEApp();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.11.0-beta.1",
+  "version": "2.11.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {