Skip to content

Commit e907691

Browse files
committed
fix(config): 修复一些情况下 alias 路径设置重复
1 parent 00e1ec4 commit e907691

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lib/models/Config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ var Config = function () {
157157
(function () {
158158
var alias = nextConfig.resolve.alias;
159159
Object.keys(alias).map(function (key) {
160-
if (key.indexOf('$') !== key.length - 1 && /^\/.+/.test(alias[key])) {
160+
if (key.indexOf('$') !== key.length - 1 && /^\/.+/.test(alias[key]) && alias[key].indexOf(_this2._config.cwd) === -1) {
161161
alias[key] = sysPath.join(_this2._config.cwd, alias[key]);
162162
}
163163
});

src/models/Config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ class Config {
143143
if (nextConfig.resolve && nextConfig.resolve.alias) {
144144
let alias = nextConfig.resolve.alias;
145145
Object.keys(alias).map((key) => {
146-
if (key.indexOf('$') !== key.length - 1 && /^\/.+/.test(alias[key])) {
146+
if (key.indexOf('$') !== key.length - 1
147+
&& /^\/.+/.test(alias[key])
148+
&& alias[key].indexOf(this._config.cwd) === -1
149+
) {
147150
alias[key] = sysPath.join(this._config.cwd, alias[key]);
148151
}
149152
});

0 commit comments

Comments
 (0)