fix(cli): 小程序端编译不能支持文件名中带 . 分割

NervJS · Aug 20, 2018 · b68b983 · b68b983
1 parent 582c98f
commit b68b983
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/taro-cli/src/util/resolve_npm_files.js b/packages/taro-cli/src/util/resolve_npm_files.js
@@ -108,13 +108,11 @@ function parseAst (ast, filePath, files, isProduction, npmConfig) {
                   let realRequirePath = path.resolve(path.dirname(filePath), requirePath)
                   let tempPathWithJS = `${realRequirePath}.js`
                   let tempPathWithIndexJS = `${realRequirePath}${path.sep}index.js`
-                  if (!path.extname(realRequirePath)) {
-                    if (fs.existsSync(tempPathWithJS)) {
-                      realRequirePath = tempPathWithJS
-                    } else if (fs.existsSync(tempPathWithIndexJS)) {
-                      realRequirePath = tempPathWithIndexJS
-                      requirePath += '/index.js'
-                    }
+                  if (fs.existsSync(tempPathWithJS)) {
+                    realRequirePath = tempPathWithJS
+                  } else if (fs.existsSync(tempPathWithIndexJS)) {
+                    realRequirePath = tempPathWithIndexJS
+                    requirePath += '/index.js'
                   }
                   if (files.indexOf(realRequirePath) < 0) {
                     files.push(realRequirePath)

diff --git a/packages/taro-cli/src/weapp.js b/packages/taro-cli/src/weapp.js
@@ -523,7 +523,7 @@ function parseAst (type, ast, depComponents, sourceFilePath, filePath, npmSkip =
                     styleFiles.push(stylePath)
                   }
                   astPath.remove()
-                } else if (!valueExtname) {
+                } else {
                   let vpath = Util.resolveScriptPath(path.resolve(sourceFilePath, '..', value))
                   let outputVpath
                   if (NODE_MODULES_REG.test(vpath)) {
@@ -641,7 +641,7 @@ function parseAst (type, ast, depComponents, sourceFilePath, filePath, npmSkip =
                       sourceDirPath = nodeModulesPath
                     }
                     astPath.replaceWith(t.stringLiteral(vpath.replace(sourceDirPath, '').replace(/\\/g, '/')))
-                  } else if (!valueExtname) {
+                  } else {
                     let vpath = Util.resolveScriptPath(path.resolve(sourceFilePath, '..', value))
                     let outputVpath
                     if (NODE_MODULES_REG.test(vpath)) {