Merge pull request #34 from mpvue/wz/fix-win-path-error

Wz/fix win path error

Author: hucq

lib/mp-compiler/index.js

@@ -5,7 +5,7 @@ const babel = require('babel-core')
 const path = require('path')
 const fs = require('fs')
 const deepEqual = require('deep-equal')
-const relative = require('relative')
+const relative = require('../utils/relative')
 
 const { parseConfig, parseComponentsDeps, parseGlobalComponents, clearGlobalComponents } = require('./parse')
 const { parseComponentsDeps: parseComponentsDepsTs } = require('./parse-ts')

lib/mp-compiler/util.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const fs = require('fs')
-const relative = require('relative')
+const relative = require('../utils/relative')
 
 const pagesNameMap = Object.create(null)
 
@@ -31,6 +31,7 @@ function getCompNameAndSrc (context, file) {
 function getNameByFile (dir) {
   // const arr = dir.match(/[pages?/components?]\/(.*?)(\/)/)
   const arr = dir.match(/pages\/(.*?)\//)
+  // 兼容 win 下的路径格式不统一的问题
   if (arr && arr[1]) {
     return arr[1]
   }
@@ -39,7 +40,7 @@ function getNameByFile (dir) {
 
 function getKeyFromObjByVal (obj, val) {
   for (const i in obj) {
-    if (obj[i] === val) {
+    if (path.resolve(obj[i]) === path.resolve(val)) {
       return i
     }
   }

lib/template-compiler/modules/transform-require.js

@@ -3,6 +3,7 @@
 var fs = require('fs')
 var path = require('path')
 var mkdirp = require('mkdirp')
+var relative = require('../../utils/relative')
 
 var defaultOptions = {
   img: 'src',
@@ -42,7 +43,7 @@ function rewrite (attrsMap, name, fileOptions) {
       var { resourcePath, outputPath, context } = fileOptions
       var assetPath = path.resolve(resourcePath, '..', value)
       // 资源路径, 为了分包，去掉了 src 目录
-      var toPath = assetPath.replace(context, '').replace(/^\/src\//, '')
+      var toPath = relative(context, assetPath).replace(/^\/src\//, '')
       attrsMap[name] = path.join(outputPath, toPath)
       copyAsset(assetPath, attrsMap[name])
     }

lib/utils/relative.js

@@ -0,0 +1,7 @@
+const relative = require('relative')
+const upath = require('upath')
+
+module.exports = function (...arv) {
+  console.log(upath.normalize(relative(...arv)))
+  return upath.normalize(relative(...arv))
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpvue-loader",
-  "version": "1.0.15",
+  "version": "1.1.0",
   "description": "mpvue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -63,6 +63,7 @@
     "relative": "^3.0.2",
     "resolve": "^1.3.3",
     "source-map": "^0.5.6",
+    "upath": "^1.1.0",
     "vue-hot-reload-api": "^2.1.0",
     "vue-loader": "^13.0.4",
     "vue-style-loader": "^3.0.0",