fix(path): 兼容windows path

Author: yuhaoju

lib/models/Project.js

@@ -147,6 +147,8 @@ var Project = function () {
     }, {
         key: 'fixCss',
         value: function fixCss() {
+            var _this2 = this;
+
             var config = this.config.getConfig(),
                 entries = config.entry,
                 cssExtNames = config.entryExtNames.css,
@@ -173,11 +175,13 @@ var Project = function () {
 
                             entryItem.forEach(function (cssPath, i) {
                                 var originCssPath = sysPath.join(config.context, cssPath);
-                                fs.appendFileSync(cacheFilePath, 'require("' + sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath) + '");', 'utf-8');
+                                var requiredPath = _this2._normalizePath(sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath));
+                                fs.appendFileSync(cacheFilePath, 'require("' + requiredPath + '");', 'utf-8');
                             });
                         } else {
                             var originCssPath = sysPath.join(config.context, entry);
-                            fs.writeFileSync(cacheFilePath, 'require("' + sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath) + '");', 'utf-8');
+                            var requiredPath = _this2._normalizePath(sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath));
+                            fs.writeFileSync(cacheFilePath, 'require("' + requiredPath + '");', 'utf-8');
                         }
 
                         fps.push(cacheFilePath);
@@ -232,7 +236,7 @@ var Project = function () {
     }, {
         key: 'pack',
         value: function pack(opt, callback) {
-            var _this2 = this;
+            var _this3 = this;
 
             var config = this.config.getConfig();
 
@@ -249,7 +253,7 @@ var Project = function () {
                     config.output = config.output.dev;
                 }
 
-                _this2.fixCss();
+                _this3.fixCss();
 
                 if (opt.sourcemap) {
                     config.devtool = opt.sourcemap;
@@ -294,7 +298,7 @@ var Project = function () {
                             }
                         });
                         info();
-                        _this2.packCallbacks.forEach(function (cb) {
+                        _this3.packCallbacks.forEach(function (cb) {
                             return cb(opt, stats);
                         });
                     }
@@ -305,9 +309,9 @@ var Project = function () {
 
             if (opt.lint) {
                 async.series([function (callback) {
-                    return _this2.lint(callback);
+                    return _this3.lint(callback);
                 }, function (callback) {
-                    return _this2.lintCss(callback);
+                    return _this3.lintCss(callback);
                 }], function (err, results) {
                     if (!err) {
                         if (results[0] && results[1]) {
@@ -361,6 +365,18 @@ var Project = function () {
                 return sysPath.resolve(context, lintPathItem);
             });
         }
+    }, {
+        key: '_normalizePath',
+        value: function _normalizePath(str, stripTrailing) {
+            if (typeof str !== 'string') {
+                throw new TypeError('expected a string');
+            }
+            str = str.replace(/[\\\/]+/g, '/');
+            if (stripTrailing !== false) {
+                str = str.replace(/\/$/, '');
+            }
+            return str;
+        }
     }]);
 
     return Project;

src/models/Project.js

@@ -142,20 +142,22 @@ class Project {
                 if(Array.isArray(entryItem)) {
                     // clear
                     fs.writeFileSync(cacheFilePath, '', 'utf-8');
-                    
+
                     entryItem.forEach((cssPath, i) => {
                         const originCssPath = sysPath.join(config.context, cssPath)
+                        const requiredPath = this._normalizePath(sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath))
                         fs.appendFileSync(
                             cacheFilePath,
-                            'require("' + sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath) + '");',
+                            'require("' + requiredPath + '");',
                             'utf-8'
                         );
                     })
                 } else {
                     const originCssPath = sysPath.join(config.context, entry)
+                    const requiredPath = this._normalizePath(sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath))
                     fs.writeFileSync(
                         cacheFilePath,
-                        'require("' + sysPath.relative(sysPath.dirname(cacheFilePath), originCssPath) + '");',
+                        'require("' + requiredPath + '");',
                         'utf-8'
                     );
                 }
@@ -329,6 +331,17 @@ class Project {
             return sysPath.resolve(context, lintPathItem)
         })
     }
+
+    _normalizePath(str, stripTrailing) {
+    	if (typeof str !== 'string') {
+    		throw new TypeError('expected a string');
+    	}
+    	str = str.replace(/[\\\/]+/g, '/');
+    	if (stripTrailing !== false) {
+    		str = str.replace(/\/$/, '');
+    	}
+    	return str;
+    }
 }
 
 module.exports = Project;