Skip to content

Commit 93b877a

Browse files
committed
fix(config): fix commands in config function not work
1 parent 1f7779f commit 93b877a

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

lib/models/Project.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,11 @@ var Project = function () {
231231
});
232232

233233
if (ykitConfigFile && ykitConfigFile.config) {
234-
extend(true, this.config, ykitConfigFile.config);
235-
handleExportsConfig.bind(this)(ykitConfigFile.config);
236-
this.setCommands(ykitConfigFile.commands || ykitConfigFile.config.command); // 后者兼容以前形式
234+
var configFileConfig = typeof ykitConfigFile.config === 'function' ? ykitConfigFile.config() : ykitConfigFile.config;
235+
236+
extend(true, this.config, configFileConfig);
237+
handleExportsConfig.bind(this)(configFileConfig);
238+
this.setCommands(ykitConfigFile.commands || configFileConfig.command); // 后者兼容以前形式
237239
this.setHooks(ykitConfigFile.hooks);
238240
this.setProxy(ykitConfigFile.proxy);
239241
this.setServer(ykitConfigFile.server);

src/models/Project.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,13 @@ class Project {
208208
});
209209

210210
if (ykitConfigFile && ykitConfigFile.config) {
211-
extend(true, this.config, ykitConfigFile.config);
212-
handleExportsConfig.bind(this)(ykitConfigFile.config);
213-
this.setCommands(ykitConfigFile.commands || ykitConfigFile.config.command); // 后者兼容以前形式
211+
const configFileConfig = typeof ykitConfigFile.config === 'function'
212+
? ykitConfigFile.config()
213+
: ykitConfigFile.config;
214+
215+
extend(true, this.config, configFileConfig);
216+
handleExportsConfig.bind(this)(configFileConfig);
217+
this.setCommands(ykitConfigFile.commands || configFileConfig.command); // 后者兼容以前形式
214218
this.setHooks(ykitConfigFile.hooks);
215219
this.setProxy(ykitConfigFile.proxy);
216220
this.setServer(ykitConfigFile.server);

0 commit comments

Comments
 (0)