fixed require path error - #128

Tencent · May 10, 2017 · 3ed844b · 3ed844b
1 parent 946587a
commit 3ed844b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/wepy-cli/src/compile-script.js b/packages/wepy-cli/src/compile-script.js
@@ -44,7 +44,8 @@ export default {
                     target = path.join(npmPath, path.relative(modulesPath, source));
                     needCopy = true;
                 } else {
-                    target = source.replace(path.sep + 'src' + path.sep, path.sep + 'dist' + path.sep);   // e:/dist/util
+                    // e:/dist/util
+                    target = util.getDistPath(source);
                     needCopy = false;
                 }
             } else if (lib.indexOf('/') === -1 || lib.indexOf('/') === lib.length - 1) {  //        require('asset');

diff --git a/packages/wepy-cli/src/util.js b/packages/wepy-cli/src/util.js
@@ -345,7 +345,9 @@ const utils = {
         let relative;
         src = src || cache.getSrc();
         dist = dist || cache.getDist();
-        ext = (ext ? ('.' + ext) : opath.ext);
+        if (typeof(opath) === 'string')
+            opath = path.parse(opath);
+        ext = (ext ? (ext[0] === '.' ? ext : ('.' + ext)) : opath.ext);
         // 第三组件
         if (opath.dir.indexOf(`${path.sep}${src}${path.sep}`) === -1 && opath.dir.indexOf('node_modules') > 1) {
             relative = path.relative(path.join(this.currentDir, 'node_modules'), opath.dir);