From bedfaa97bc6c51d42154ec8dd1537cf37f95d981 Mon Sep 17 00:00:00 2001 From: cpselvis Date: Fri, 8 Sep 2017 17:52:33 +0800 Subject: [PATCH] fix: support yeoman generator app/index.js folder --- lib/internal/generator/generator.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/internal/generator/generator.js b/lib/internal/generator/generator.js index ece0e5f8..06f62f48 100644 --- a/lib/internal/generator/generator.js +++ b/lib/internal/generator/generator.js @@ -38,20 +38,24 @@ class Generator { name && self.run(name, ctx); }); } else { - log.warn('检测到你还未安装任何模板，请先安装后再进行项目初始化，参考文档：https://github.com/iv-web/feflow-cli/blob/master/README.md') + log.warn( + '检测到你还未安装任何模板，请先安装后再进行项目初始化，' + + '参考文档：https://github.com/iv-web/feflow-cli/blob/master/README.md' + ); } }); } run(name) { const ctx = this.ctx; - const pluginDir = ctx.pluginDir; + let path = pathFn.join(pluginDir, name, 'app/index.js'); - const path = pathFn.join(pluginDir, name, 'generators/app/index.js'); + if (!fs.existsSync(path)) { + path = pathFn.join(pluginDir, name, 'generators', 'app/index.js'); + } yeomanEnv.register(require.resolve(path), name); - yeomanEnv.run(name, { 'skip-install': true }, err => {}); } @@ -88,10 +92,7 @@ class Generator { const json = JSON.parse(content); const desc = json.description; - return { - name, - desc - }; + return { name, desc }; }); }); }