fix winPath

lib/plugin/include.js

@@ -5,6 +5,7 @@ var File = require('vinyl');
 var join = require('path').join;
 var extend = require('extend');
 var through = require('through2');
+var winPath = require('../util').winPath;
 var common = require('../common');
 var getDepsPackage = common.getDepsPackage;
 var getExtra = common.getExtra;
@@ -17,7 +18,7 @@ module.exports = function(opt) {
   return through.obj(function(file, enc, cb) {
     var self = this;
     var base = file.base;
-    var filepath = file.relative;
+    var filepath = winPath(file.relative);
 
     var endFile = file.clone();
     endFile.dependentPath = file.path;

lib/plugin/js.js

@@ -8,6 +8,7 @@ var template = util.template;
 var isRelative = util.isRelative;
 var hideExt = util.hideExt;
 var resolvePath = util.resolvePath;
+var winPath = util.winPath;
 var common = require('../common');
 var createStream = common.createStream;
 var transportDeps = common.transportDeps;
@@ -59,7 +60,7 @@ function replace(code, fInfo, options) {
 function replaceId(id, pkg, options, base) {
   if (isRelative(id)) {
     id = hideExt(id);
-    var file = resolvePath(id, base);
+    var file = winPath(resolvePath(id, base));
     file = findFile(file, pkg.files);
     return transportId(file, pkg, options);
   }

test/expected/transport-include-all-ignore.js

@@ -1,4 +1,4 @@
-define("a/1.0.0/index", ["b","c"], function(require, exports, module){
+define("a/1.0.0/src/index", ["b","c"], function(require, exports, module){
 require('b');
 require("a/1.0.0/a");
 

test/expected/transport-include-all-ignore2.js

@@ -1,4 +1,4 @@
-define("a/1.0.0/index", ["c"], function(require, exports, module){
+define("a/1.0.0/src/index", ["c"], function(require, exports, module){
 require("b/1.0.0/index");
 require("a/1.0.0/a");
 

test/expected/transport-include-all.js

@@ -1,4 +1,4 @@
-define("a/1.0.0/index", [], function(require, exports, module){
+define("a/1.0.0/src/index", [], function(require, exports, module){
 require("b/1.0.0/index");
 require("a/1.0.0/a");
 

test/expected/transport-include-relative-ignore.js

@@ -1,4 +1,4 @@
-define("a/1.0.0/index", ["b","c"], function(require, exports, module){
+define("a/1.0.0/src/index", ["b","c"], function(require, exports, module){
 require('b');
 require("a/1.0.0/a");
 

test/expected/transport-include-relative.js

@@ -1,4 +1,4 @@
-define("a/1.0.0/index", ["b/1.0.0/index","c/1.0.0/index"], function(require, exports, module){
+define("a/1.0.0/src/index", ["b/1.0.0/index","c/1.0.0/index"], function(require, exports, module){
 require("b/1.0.0/index");
 require("a/1.0.0/a");
 

test/expected/transport-include-self-ignore.js

@@ -1,4 +1,4 @@
-define("a/1.0.0/index", ["b","c","a/1.0.0/a"], function(require, exports, module){
+define("a/1.0.0/src/index", ["b","c","a/1.0.0/a"], function(require, exports, module){
 require('b');
 require("a/1.0.0/a");
 

test/expected/transport-include-self.js

@@ -1,4 +1,4 @@
-define("a/1.0.0/index", ["b/1.0.0/index","c/1.0.0/index","a/1.0.0/a"], function(require, exports, module){
+define("a/1.0.0/src/index", ["b/1.0.0/index","c/1.0.0/index","a/1.0.0/a"], function(require, exports, module){
 require("b/1.0.0/index");
 require("a/1.0.0/a");
 

test/expected/transport-other-ext-debug.js

@@ -0,0 +1,28 @@
+define("a/1.0.0/index-debug", [], function(require, exports, module){
+require("a/1.0.0/a.runtime-debug");
+require("a/1.0.0/jquery.plugin-debug");
+require("a/1.0.0/a-debug.tpl");
+require("a/1.0.0/src/index-debug");
+require("a/1.0.0/src/one.two.three-debug");
+
+});
+define("a/1.0.0/a.runtime-debug", [], function(require, exports, module){
+console.log('a.runtime.js');
+
+});
+define("a/1.0.0/jquery.plugin-debug", [], function(require, exports, module){
+console.log('jquery.plugin.js');
+
+});
+define("a/1.0.0/a-debug.tpl", [], function(require, exports, module){
+module.exports = '<div></div>';
+
+});
+define("a/1.0.0/src/index-debug", [], function(require, exports, module){
+console.log('src/index.js');
+
+});
+define("a/1.0.0/src/one.two.three-debug", [], function(require, exports, module){
+console.log('src/one.two.three.js');
+
+});

test/expected/transport-other-ext.js

@@ -0,0 +1,28 @@
+define("a/1.0.0/index", [], function(require, exports, module){
+require("a/1.0.0/a.runtime");
+require("a/1.0.0/jquery.plugin");
+require("a/1.0.0/a.tpl");
+require("a/1.0.0/src/index");
+require("a/1.0.0/src/one.two.three");
+
+});
+define("a/1.0.0/a.runtime", [], function(require, exports, module){
+console.log('a.runtime.js');
+
+});
+define("a/1.0.0/jquery.plugin", [], function(require, exports, module){
+console.log('jquery.plugin.js');
+
+});
+define("a/1.0.0/a.tpl", [], function(require, exports, module){
+module.exports = '<div></div>';
+
+});
+define("a/1.0.0/src/index", [], function(require, exports, module){
+console.log('src/index.js');
+
+});
+define("a/1.0.0/src/one.two.three", [], function(require, exports, module){
+console.log('src/one.two.three.js');
+
+});

test/fixtures/js-require-js/package.json

@@ -2,6 +2,7 @@
   "name": "a",
   "version": "1.0.0",
   "spm": {
+    "main": "src/index.js",
     "dependencies": {
       "b": "1.0.0"
     }

test/fixtures/js-require-js/src/index.js

@@ -0,0 +1,2 @@
+require('b');
+require('../a');

test/fixtures/require-other-ext/a.runtime.js

@@ -0,0 +1 @@
+console.log('a.runtime.js');

test/fixtures/require-other-ext/a.tpl

@@ -0,0 +1 @@
+<div></div>

test/fixtures/require-other-ext/index.js

@@ -0,0 +1,5 @@
+require('./a.runtime.js');
+require('./jquery.plugin');
+require('./a.tpl');
+require('./src');
+require('./src/one.two.three');

test/fixtures/require-other-ext/src/index.js

@@ -0,0 +1 @@
+console.log('src/index.js');

test/fixtures/require-other-ext/src/one.two.three.js

@@ -0,0 +1 @@
+console.log('src/one.two.three.js');