Skip to content

Commit a11d481

Browse files
committed
feat: 增加适配多服务入口配置逻辑
1 parent f7f9ffe commit a11d481

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"jest": "^24.9.0"
6060
},
6161
"dependencies": {
62-
"@micro-app/core": "^0.4.0",
62+
"@micro-app/core": "^0.4.1",
6363
"@zkochan/cmd-shim": "^4.3.0",
6464
"read-cmd-shim": "^2.0.0",
6565
"update-notifier": "^4.1.3"

src/plugins/commands/check/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ Examples:
3939
}
4040
});
4141
};
42+
43+
module.exports.configuration = {
44+
description: '检测依赖是否冲突',
45+
};

src/plugins/extends/server/index.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function extendServer(api, opts) {
55
const registerMethods = require('./methods');
66
registerMethods(api);
77

8-
const { _, smartMerge } = require('@micro-app/shared-utils');
8+
const { _, smartMerge, path } = require('@micro-app/shared-utils');
99

1010
const logger = api.logger;
1111

@@ -22,13 +22,16 @@ module.exports = function extendServer(api, opts) {
2222
const microConfig = api.selfConfig;
2323
const _originalConfig = microConfig.originalConfig || {};
2424
const _serverConfig = _originalConfig.server || {};
25-
return {
25+
const _config = {
2626
..._serverConfig,
2727
info: microConfig.toJSON(),
2828
shared: microConfig.shared,
2929
sharedObj: microConfig.sharedObj,
3030
resolveShared: microConfig.resolveShared,
3131
};
32+
// 兼容 entry, 创建一个 entries
33+
_config.entries = _config.entry ? [ path.resolve(microConfig.root, _config.entry) ] : [];
34+
return _config;
3235
});
3336

3437
api.extendConfig('microsServerConfig', {
@@ -51,6 +54,8 @@ module.exports = function extendServer(api, opts) {
5154
sharedObj: microConfig.sharedObj,
5255
resolveShared: microConfig.resolveShared,
5356
};
57+
// 兼容 entry, 创建一个 entries
58+
config[key].entries = config[key].entry ? [ path.resolve(microConfig.root, config[key].entry) ] : [];
5459
} else {
5560
logger.error('[microsServerConfig]', `Not Found micros: "${key}"`);
5661
}
@@ -76,8 +81,10 @@ module.exports = function extendServer(api, opts) {
7681
'shared',
7782
'sharedObj',
7883
'resolveShared',
84+
'entries',
7985
]);
8086
}), selfServerConfig);
87+
8188
return Object.assign({}, mergeConfig, { root: api.root });
8289
});
8390

0 commit comments

Comments
 (0)