Просмотр исходного кода

improve loading plugins when development

Yuki Takei 9 лет назад
Родитель
Сommit
a89a9e271e
2 измененных файлов с 12 добавлено и 9 удалено
  1. 10 7
      lib/crowi/dev.js
  2. 2 2
      package.json

+ 10 - 7
lib/crowi/dev.js

@@ -48,15 +48,18 @@ class CrowiDev {
   }
 
   loadPlugins(app) {
-    if (process.env.PLUGIN_NAMES_TOBE_LOADED === undefined) {
-      return
-    }
+    if (process.env.PLUGIN_NAMES_TOBE_LOADED !== undefined
+        && process.env.PLUGIN_NAMES_TOBE_LOADED.length > 0) {
 
-    const pluginNames = process.env.PLUGIN_NAMES_TOBE_LOADED.split(',');
+      const pluginNames = process.env.PLUGIN_NAMES_TOBE_LOADED.split(',');
 
-    var PluginService = require('../plugins/plugin.service');
-    var pluginService = new PluginService(this.crowi, app);
-    pluginService.loadPlugins(pluginNames);
+      // merge and remove duplicates
+      if (pluginNames.length > 0) {
+        var PluginService = require('../plugins/plugin.service');
+        var pluginService = new PluginService(this.crowi, app);
+        pluginService.loadPlugins(pluginNames);
+      }
+    }
   }
 }
 

+ 2 - 2
package.json

@@ -31,8 +31,8 @@
     "prebuild:dev": "env-cmd config/env.dev.js npm run plugin:def",
     "prebuild:prod": "npm run plugin:def",
     "prestart": "npm run build:prod",
-    "server:dev:watch": "node-dev app.js --watch",
-    "server:dev": "node app.js",
+    "server:dev:watch": "env-cmd config/env.dev.js node-dev app.js --watch",
+    "server:dev": "env-cmd config/env.dev.js node app.js",
     "server:prod:container": "node app.js --production --container",
     "server:prod:onpremise": "mkdirp logs && node app.js --production --onpremise",
     "server:prod": "npm run server:prod:onpremise",