ee-core 1.1.0 → 1.1.3

package/core/lib/ee.js

@@ -94,7 +94,8 @@ class EeCore extends KoaApplication {
       logger: this.console,
       app: this,
       env: options.env,
-      appUserData: options.appUserData
+      appUserData: options.appUserData,
+      isPackaged: options.isPackaged
     });
   }
 

package/core/lib/loader/ee_loader.js

@@ -38,7 +38,7 @@ class EeLoader {
      * @see {@link AppInfo#pkg}
      * @since 1.0.0
      */
-    this.pkg = utility.readJSONSync(path.join(this.options.homeDir, 'package.json'));
+    this.pkg = this.getPkg();
 
     /**
      * Framework directories
@@ -127,7 +127,7 @@ class EeLoader {
       debug('Loaded appname(%s) from package.json', this.pkg.name);
       return this.pkg.name;
     }
-    const pkg = path.join(this.options.baseDir, 'package.json');
+
     throw new Error(`name is required from ${pkg}`);
   }
 
@@ -407,6 +407,18 @@ class EeLoader {
 
     return fullPath;
   }
+
+  getPkg() {
+    //let filePath = '';
+    // let variablePath = 'build'; // 打包前路径
+    // if (this.options.isPackaged) {
+    //   variablePath = '..'; // 打包后路径
+    // }
+    // filePath = path.join(app.getAppPath(), variablePath, "package.json");
+
+    const content = utility.readJSONSync(path.join(this.options.homeDir, 'package.json'));
+    return content;
+  }  
 }
 
 /**

package/lib/application.js

@@ -10,19 +10,23 @@ class Appliaction extends EeApp {
     // const opt = this.initEnv();
     const { env } = process;
 
+    // 路径不能使用绝对，打包前后有问题
+    
+
     let options = {
       env: 'prod',
       serverScope: '',
       type: 'application',
       baseDir: path.join(app.getAppPath(), 'electron'),
-      homeDir: process.cwd(),
-      framework: path.join(process.cwd(), 'node_modules/ee-core'),
+      homeDir: app.getAppPath(),
+      framework: path.join(app.getAppPath(), 'node_modules', 'ee-core'),
       appName: app.getName(),
       userHome: app.getPath('home'),
       appData: app.getPath('appData'),
       appUserData: app.getPath('userData'),
       logsDir: app.getPath('logs'),
-      appVersion: app.getVersion()
+      appVersion: app.getVersion(),
+      isPackaged: app.isPackaged
     }
 
     // argv

package/lib/eeApp.js

@@ -82,7 +82,7 @@ class EeApp extends BaseApp {
     this.electron.mainWindow = new BrowserWindow(winOptions);
 
     // 隐藏菜单
-    if (this.config.openAppMenu) {
+    if (!this.config.openAppMenu) {
       Menu.setApplicationMenu(null);
     }
 
@@ -234,7 +234,6 @@ class EeApp extends BaseApp {
    * egg
    */
   startEgg (argv) {
-    const startCluster = require('egg-cluster').startCluster;
     
     let homeDir = this.homeDir;
     argv.baseDir = homeDir;
@@ -256,12 +255,9 @@ class EeApp extends BaseApp {
     const clusterOptions = this.stringify(argv, ignoreKeys);
     const options = JSON.parse(clusterOptions);
     this.coreLogger.info('[ee-core:EeApp] [startEgg] options', options);
-
-    return new Promise((resolve, reject) => {
-      startCluster(options, function(){
-        resolve('success');
-      });
-    });
+    if (is.function(this.startEggCluster)) {
+      return this.startEggCluster(options);
+    }
   }
 
   /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ee-core",
-  "version": "1.1.0",
-  "description": "electron-egg core",
+  "version": "1.1.3",
+  "description": "ee core",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/utils/index.js

@@ -50,7 +50,9 @@ exports.chmodPath = function(path, mode) {
  * 获取项目根目录package.json
  */
 exports.getPackage = function() {
-  const filePath = path.join(process.cwd(), 'package.json');
+  const cdb = this.getCoreDB();
+  const config = cdb.getItem('config');
+  const filePath = path.join(config.homeDir, 'package.json');
   const json = require(filePath);
   
   return json;