fix(cli): h5 端编译对于带有后缀的资源引用编译错误

NervJS · Jan 6, 2019 · a96c994 · a96c994
1 parent 3b77193
commit a96c994
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/packages/taro-cli/src/h5.js b/packages/taro-cli/src/h5.js
@@ -394,10 +394,11 @@ function processEntry (code, filePath) {
             if (pathArr.indexOf('pages') >= 0) {
               astPath.remove()
             } else if (Util.REG_SCRIPTS.test(value)) {
-              /* TODO windows下路径处理可能有问题 ../../lib/utils.js */
-              const dirname = path.dirname(value)
-              const extname = path.extname(value)
-              node.source = t.stringLiteral(path.join(dirname, path.basename(value, extname)).replace(/\\/g, '/'))
+              const realPath = path.resolve(filePath, '..', value)
+              const dirname = path.dirname(realPath)
+              const extname = path.extname(realPath)
+              const removeExtPath = path.join(dirname, path.basename(realPath, extname))
+              node.source = t.stringLiteral(Util.promoteRelativePath(path.relative(filePath, removeExtPath)).replace(/\\/g, '/'))
             }
           }
           return
@@ -654,9 +655,11 @@ function processOthers (code, filePath, fileType) {
         }
         if (!Util.isNpmPkg(value)) {
           if (Util.REG_SCRIPTS.test(value)) {
-            const dirname = path.dirname(value)
-            const extname = path.extname(value)
-            node.source = t.stringLiteral(path.join(dirname, path.basename(value, extname)).replace(/\\/g, '/'))
+            const realPath = path.resolve(filePath, '..', value)
+            const dirname = path.dirname(realPath)
+            const extname = path.extname(realPath)
+            const removeExtPath = path.join(dirname, path.basename(realPath, extname))
+            node.source = t.stringLiteral(Util.promoteRelativePath(path.relative(filePath, removeExtPath)).replace(/\\/g, '/'))
           }
         } else if (value === PACKAGES['@tarojs/taro']) {
           let specifier = specifiers.find(item => item.type === 'ImportDefaultSpecifier')