fixed build directory mixed bug

Tencent · Apr 10, 2017 · 116ace5 · 116ace5 · Gcaufy · Apr 10, 2017
1 parent 7597f0d
commit 116ace5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 1.5.2 (waiting)
 * `A` style标签添加了scoped属性的支持。[ISSUE #79](https://github.com/wepyjs/wepy/issues/79)
+* `F` 修改了项目外层有`src`目录会导致编译文件目录错乱的BUG。[ISSUE #91](https://github.com/wepyjs/wepy/issues/91)
 
 
 ## 1.5.1 (2017-03-27) 

diff --git a/packages/wepy-cli/src/util.js b/packages/wepy-cli/src/util.js
@@ -351,8 +351,11 @@ const utils = {
         // 第三组件
         if (opath.dir.indexOf(`${path.sep}${src}${path.sep}`) === -1 && opath.dir.indexOf('node_modules') > 1) {
             dir = opath.dir.replace('node_modules', `${dist}${path.sep}npm`) + path.sep;
-        } else
-            dir = (opath.dir + path.sep).replace(path.sep + src + path.sep, path.sep + dist + path.sep);
+        } else {
+            let currentPath = path.relative(this.currentDir + path.sep + src, opath.dir);
+            dir = path.join(this.currentDir, dist, currentPath);
+            //dir = (opath.dir + path.sep).replace(path.sep + src + path.sep, path.sep + dist + path.sep);
+        }
         return dir + opath.name + ext;
     },
     getModifiedTime (p) {