Skip to content

Commit c9ff1b9

Browse files
committed
feat(alias): 兼容fekit形式alias
1 parent d5099e8 commit c9ff1b9

File tree

2 files changed

+10
-54
lines changed

2 files changed

+10
-54
lines changed

src/models/Config.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@ class Config {
102102
nextConfig.context = sysPath.resolve(this._config.cwd, nextConfig.context)
103103
}
104104

105-
// if(nextConfig.resolve.alias) {
106-
// let alias = nextConfig.resolve.alias
107-
// Object.keys(alias).map(function(key, i){
108-
// console.log(alias[key]);
109-
// alias[key] = sysPath.relative(nextConfig.context, alias[key])
110-
// console.log(nextConfig.context, alias[key]);
111-
// })
112-
// extend(true, this._config.resolve.alias, alias);
113-
// }
105+
const context = nextConfig.context || this._config.context
106+
const relativeContext = sysPath.relative(this._config.cwd, context)
107+
if(nextConfig.resolve.alias) {
108+
let alias = nextConfig.resolve.alias
109+
Object.keys(alias).map(function(key, i){
110+
alias[key] = sysPath.relative(relativeContext, alias[key])
111+
})
112+
extend(true, this._config.resolve.alias, alias);
113+
}
114114

115-
this._config.resolve.root.push(nextConfig.context)
115+
this._config.resolve.root.push(context)
116116

117117
extend(true, this._config, nextConfig);
118118
}

src/models/loader.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)