diff --git a/project/build.js b/project/build.js index 70de82c..4d45706 100644 --- a/project/build.js +++ b/project/build.js @@ -87,17 +87,20 @@ const init = () => { const generateMain = project => { const getApps = new Promise(resolve => { const appLib = path.join(__dirname, project.toString(), 'apps.import.json') + fsExtra.readJson(appLib, (err, data) => { chalkTag.info(project + '加载业务应用配置...') let apps = [] if (data) { fsExtra.emptyDirSync(`project/${project}/apps`) - findApp('src/mods', file => { - apps.push(file) - }).then(() => { + Promise.all([ + findApp(`src/project/${project}`, f => apps.push(f)), + findApp('src/mods', file => apps.push(file)) + ]).then(() => { Promise.all(Object.keys(data).map(e => { let app = [...new Set(apps)].find(s => s.indexOf(e) > -1) if (app) { + log('应用#%s#加载中...', e) return copyFiles(`project/${project}/apps/${e}`, app) } })).then(() => { @@ -105,6 +108,7 @@ const generateMain = project => { resolve() }) }) + } else { chalkTag.done(project + '业务应用无打包') resolve()